diff --git a/tools/docker/Dockerfile.test_spack_openmpi-psmp b/tools/docker/Dockerfile.test_spack_openmpi-psmp index b825df1699..472258b0bd 100644 --- a/tools/docker/Dockerfile.test_spack_openmpi-psmp +++ b/tools/docker/Dockerfile.test_spack_openmpi-psmp @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv psmp -gv 13 -mpi openmpi FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ g++-13 gcc gcc-13 gfortran gfortran-13 \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_psmp b/tools/docker/Dockerfile.test_spack_psmp index 98469fe0fb..e852a77569 100644 --- a/tools/docker/Dockerfile.test_spack_psmp +++ b/tools/docker/Dockerfile.test_spack_psmp @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv psmp -gv 13 -mpi mpich" FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ g++-13 gcc gcc-13 gfortran gfortran-13 \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_psmp-4x2 b/tools/docker/Dockerfile.test_spack_psmp-4x2 index c6b24771e2..e480c2dd87 100644 --- a/tools/docker/Dockerfile.test_spack_psmp-4x2 +++ b/tools/docker/Dockerfile.test_spack_psmp-4x2 @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv psmp -gv 13 -mpi mpich" FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ g++-13 gcc gcc-13 gfortran gfortran-13 \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_psmp-gcc10 b/tools/docker/Dockerfile.test_spack_psmp-gcc10 index 3a95be7bc7..ade4517ea1 100644 --- a/tools/docker/Dockerfile.test_spack_psmp-gcc10 +++ b/tools/docker/Dockerfile.test_spack_psmp-gcc10 @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv psmp -gv 10 -mpi mpich" FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ g++-10 gcc gcc-10 gfortran gfortran-10 \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_psmp-gcc11 b/tools/docker/Dockerfile.test_spack_psmp-gcc11 index 506d6014b9..a2820b2c49 100644 --- a/tools/docker/Dockerfile.test_spack_psmp-gcc11 +++ b/tools/docker/Dockerfile.test_spack_psmp-gcc11 @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv psmp -gv 11 -mpi mpich" FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ g++-11 gcc gcc-11 gfortran gfortran-11 \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_psmp-gcc12 b/tools/docker/Dockerfile.test_spack_psmp-gcc12 index 5d235b329b..4dd8a96790 100644 --- a/tools/docker/Dockerfile.test_spack_psmp-gcc12 +++ b/tools/docker/Dockerfile.test_spack_psmp-gcc12 @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv psmp -gv 12 -mpi mpich" FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ g++-12 gcc gcc-12 gfortran gfortran-12 \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_psmp-gcc14 b/tools/docker/Dockerfile.test_spack_psmp-gcc14 index 64f42f0bb5..d2a3ae458a 100644 --- a/tools/docker/Dockerfile.test_spack_psmp-gcc14 +++ b/tools/docker/Dockerfile.test_spack_psmp-gcc14 @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv psmp -gv 14 -mpi mpich" FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ g++-14 gcc gcc-14 gfortran gfortran-14 \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_psmp-gcc15 b/tools/docker/Dockerfile.test_spack_psmp-gcc15 index dc8573b907..761ba78b12 100644 --- a/tools/docker/Dockerfile.test_spack_psmp-gcc15 +++ b/tools/docker/Dockerfile.test_spack_psmp-gcc15 @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv psmp -gv 15 -mpi mpich" FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ gcc gfortran \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_ssmp b/tools/docker/Dockerfile.test_spack_ssmp index 5323b04d48..c595017526 100644 --- a/tools/docker/Dockerfile.test_spack_ssmp +++ b/tools/docker/Dockerfile.test_spack_ssmp @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv ssmp -gv 13 -mpi no" FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ g++-13 gcc gcc-13 gfortran gfortran-13 \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/Dockerfile.test_spack_ssmp-static b/tools/docker/Dockerfile.test_spack_ssmp-static index 3d07a7deb2..2235aabe1f 100644 --- a/tools/docker/Dockerfile.test_spack_ssmp-static +++ b/tools/docker/Dockerfile.test_spack_ssmp-static @@ -54,7 +54,6 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv ssmp-static -gv 14 -mpi FROM "${BASE_IMAGE}" AS install_cp2k RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ g++ gcc gfortran \ python3 \ && rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index 811271b0e9..025d77a2ba 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -731,7 +731,6 @@ RUN dnf -qy install \ elif base_image == "ubuntu:24.04": output += rf""" RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - findutils \ {gcc_compilers} \ python3 \ && rm -rf /var/lib/apt/lists/*