comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-28 22:25:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace docker file for gcc15 by gcc10

Browse source
This commit is contained in:
Matthias Krack 2026-01-28 13:25:39 +01:00
parent 89bea08878
commit e227b41fd7
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tools/docker/Dockerfile.make_cp2k_psmp-gcc15 → tools/docker/Dockerfile.make_cp2k_psmp-gcc10
View file

@ -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"

4
tools/docker/generate_dockerfiles.py
View file

@ -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"