From e227b41fd7c972fa74e64e9918a0a3724b2a613a Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Wed, 28 Jan 2026 13:25:39 +0100 Subject: [PATCH] Replace docker file for gcc15 by gcc10 --- ..._psmp-gcc15 => Dockerfile.make_cp2k_psmp-gcc10} | 14 +++++++------- tools/docker/generate_dockerfiles.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) rename tools/docker/{Dockerfile.make_cp2k_psmp-gcc15 => Dockerfile.make_cp2k_psmp-gcc10} (77%) diff --git a/tools/docker/Dockerfile.make_cp2k_psmp-gcc15 b/tools/docker/Dockerfile.make_cp2k_psmp-gcc10 similarity index 77% rename from tools/docker/Dockerfile.make_cp2k_psmp-gcc15 rename to tools/docker/Dockerfile.make_cp2k_psmp-gcc10 index ecc7d8c8ca..03d70e868c 100644 --- a/tools/docker/Dockerfile.make_cp2k_psmp-gcc15 +++ b/tools/docker/Dockerfile.make_cp2k_psmp-gcc10 @@ -1,6 +1,6 @@ # # This file was created by generate_dockerfiles.py. -# Usage: ./spack_cache_start.sh; podman build --network=host --shm-size=1g -f ./Dockerfile.make_cp2k_psmp-gcc15 ../../ +# Usage: ./spack_cache_start.sh; podman build --network=host --shm-size=1g -f ./Dockerfile.make_cp2k_psmp-gcc10 ../../ # FROM "ubuntu:24.04" @@ -9,9 +9,9 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ bzip2 \ ca-certificates \ cmake \ - g++-15 \ - gcc-15 \ - gfortran-15 \ + g++-10 \ + gcc-10 \ + gfortran-10 \ git \ gnupg \ libssh-dev \ @@ -35,9 +35,9 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ && rm -rf /var/lib/apt/lists/* # Create links in /usr/local/bin to overrule links in /usr/bin -RUN ln -sf /usr/bin/gcc-15 /usr/local/bin/gcc && \ - ln -sf /usr/bin/g++-15 /usr/local/bin/g++ && \ - ln -sf /usr/bin/gfortran-15 /usr/local/bin/gfortran +RUN ln -sf /usr/bin/gcc-10 /usr/local/bin/gcc && \ + ln -sf /usr/bin/g++-10 /usr/local/bin/g++ && \ + ln -sf /usr/bin/gfortran-10 /usr/local/bin/gfortran ARG SPACK_CACHE="s3://spack-cache --s3-endpoint-url=http://localhost:9000" diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py index 0e302070fc..ad8d7c6700 100755 --- a/tools/docker/generate_dockerfiles.py +++ b/tools/docker/generate_dockerfiles.py @@ -56,8 +56,8 @@ def main() -> None: with OutputFile(f"Dockerfile.make_cp2k_psmp", args.check) as f: f.write(install_make_cp2k("psmp", mpi_mode="mpich")) - with OutputFile(f"Dockerfile.make_cp2k_psmp-gcc15", args.check) as f: - f.write(install_make_cp2k("psmp", mpi_mode="mpich", gcc_version=15)) + with OutputFile(f"Dockerfile.make_cp2k_psmp-gcc10", args.check) as f: + f.write(install_make_cp2k("psmp", mpi_mode="mpich", gcc_version=10)) with OutputFile(f"Dockerfile.make_cp2k_psmp-4x2", args.check) as f: testopts = f"--mpiranks=4 --ompthreads=2"