diff --git a/base-10/Dockerfile b/base-10/Dockerfile index 96dfc072ed22ddf30361be7b12a08db111ff38be..118a191df6114685e0bdc6101986dda7a07ad1c5 100644 --- a/base-10/Dockerfile +++ b/base-10/Dockerfile @@ -14,8 +14,6 @@ RUN apt-get update && apt-get dist-upgrade --no-install-recommends --yes \ coinor-libipopt-dev \ curl \ flex \ - g++-7 \ - gcc-7 \ gfortran \ git \ git-lfs \ diff --git a/base-10/opts.gcc.c++17 b/base-10/opts.gcc.c++17 index 0d741a49117594d598c2ee926db66d5c7c49efc0..aba39620ff983fc09ccb4c0d0cdf01b6e59d2adf 100644 --- a/base-10/opts.gcc.c++17 +++ b/base-10/opts.gcc.c++17 @@ -1 +1 @@ -CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=/usr/bin/g++-7 -DCMAKE_C_COMPILER=/usr/bin/gcc-7 -DCXX_MAX_STANDARD=17 -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}} -DCMAKE_INSTALL_PREFIX=/duneci/install" +CMAKE_FLAGS="-DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_C_COMPILER=/usr/bin/gcc -DCXX_MAX_STANDARD=17 -DCMAKE_CXX_FLAGS='-O2 -g -Wall -fdiagnostics-color=always' ${DUNECI_PARALLEL:+-DDUNE_MAX_TEST_CORES=${DUNECI_PARALLEL}} -DCMAKE_INSTALL_PREFIX=/duneci/install"