Skip to content

Commit

Permalink
Docker: Upgrade to Ubuntu 22.04
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed May 11, 2022
1 parent 2f521c8 commit fd9656a
Show file tree
Hide file tree
Showing 35 changed files with 303 additions and 73 deletions.
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.prod_generic_pdbg
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.prod_generic_pdbg ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.prod_generic_psmp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.prod_generic_psmp ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.prod_generic_sdbg
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.prod_generic_sdbg ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.prod_generic_ssmp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.prod_generic_ssmp ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.prod_pdbg
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.prod_pdbg ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.prod_psmp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.prod_psmp ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.prod_sdbg
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.prod_sdbg ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.prod_ssmp
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.prod_ssmp ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.test_aiida
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.test_aiida ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.test_ase
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.test_ase ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.test_conventions
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.test_conventions ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.test_coverage-pdbg
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.test_coverage-pdbg ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
4 changes: 2 additions & 2 deletions tools/docker/Dockerfile.test_coverage-sdbg
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# Usage: docker build -f ./Dockerfile.test_coverage-sdbg ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu:20.04
RUN ./install_requirements.sh ubuntu:22.04

# Install the toolchain.
RUN mkdir scripts
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/Dockerfile.test_doxygen
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Usage: docker build -f ./Dockerfile.test_doxygen ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install dependencies.
WORKDIR /opt/cp2k
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/Dockerfile.test_gcc10
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Usage: docker build -f ./Dockerfile.test_gcc10 ../../
#

FROM ubuntu:20.04
FROM ubuntu:22.04

# Install Ubuntu packages.
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
Expand Down
116 changes: 116 additions & 0 deletions tools/docker/Dockerfile.test_gcc11
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
#
# This file was created by generate_dockerfiles.py.
# Usage: docker build -f ./Dockerfile.test_gcc11 ../../
#

FROM ubuntu:22.04

# Install Ubuntu packages.
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
apt-get update -qq && apt-get install -qq --no-install-recommends \
cmake \
gcc-11 \
g++-11 \
gfortran-11 \
fftw3-dev \
libopenblas-dev \
libgsl-dev \
libhdf5-dev \
&& rm -rf /var/lib/apt/lists/*

# Create links in /usr/local/bin to overrule links in /usr/bin.
RUN ln -sf /usr/bin/gcc-11 /usr/local/bin/gcc && \
ln -sf /usr/bin/g++-11 /usr/local/bin/g++ && \
ln -sf /usr/bin/gfortran-11 /usr/local/bin/gfortran

# Install requirements for the toolchain.
WORKDIR /opt/cp2k-toolchain
COPY ./tools/toolchain/install_requirements*.sh ./
RUN ./install_requirements.sh ubuntu

# Install the toolchain.
RUN mkdir scripts
COPY ./tools/toolchain/scripts/VERSION \
./tools/toolchain/scripts/parse_if.py \
./tools/toolchain/scripts/tool_kit.sh \
./tools/toolchain/scripts/common_vars.sh \
./tools/toolchain/scripts/signal_trap.sh \
./tools/toolchain/scripts/get_openblas_arch.sh \
./scripts/
COPY ./tools/toolchain/install_cp2k_toolchain.sh .
RUN ./install_cp2k_toolchain.sh \
--mpi-mode=no \
--with-gcc=system \
--with-cmake=system \
--with-fftw=system \
--with-openblas=system \
--with-gsl=system \
--with-hdf5=system \
--with-libxc=install \
--with-libxsmm=install \
--with-libint=install \
--with-libvori=install \
--dry-run

# Dry-run leaves behind config files for the followup install scripts.
# This breaks up the lengthy installation into smaller docker build steps.
COPY ./tools/toolchain/scripts/stage0/ ./scripts/stage0/
RUN ./scripts/stage0/install_stage0.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/stage1/ ./scripts/stage1/
RUN ./scripts/stage1/install_stage1.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/stage2/ ./scripts/stage2/
RUN ./scripts/stage2/install_stage2.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/stage3/ ./scripts/stage3/
RUN ./scripts/stage3/install_stage3.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/stage4/ ./scripts/stage4/
RUN ./scripts/stage4/install_stage4.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/stage5/ ./scripts/stage5/
RUN ./scripts/stage5/install_stage5.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/stage6/ ./scripts/stage6/
RUN ./scripts/stage6/install_stage6.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/stage7/ ./scripts/stage7/
RUN ./scripts/stage7/install_stage7.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/stage8/ ./scripts/stage8/
RUN ./scripts/stage8/install_stage8.sh && rm -rf ./build

COPY ./tools/toolchain/scripts/arch_base.tmpl \
./tools/toolchain/scripts/generate_arch_files.sh \
./scripts/
RUN ./scripts/generate_arch_files.sh && rm -rf ./build

# Install CP2K using local.ssmp.
WORKDIR /opt/cp2k
COPY ./Makefile .
COPY ./src ./src
COPY ./exts ./exts
COPY ./tools/build_utils ./tools/build_utils
RUN /bin/bash -c " \
mkdir -p arch && \
ln -vs /opt/cp2k-toolchain/install/arch/local.ssmp ./arch/ && \
echo 'Compiling cp2k...' && \
source /opt/cp2k-toolchain/install/setup && \
( make -j ARCH=local VERSION=ssmp &> /dev/null || true )"
COPY ./data ./data
COPY ./tests ./tests
COPY ./tools/regtesting ./tools/regtesting

# Run regression tests.
ARG TESTOPTS=""
COPY ./tools/docker/scripts/test_regtest.sh ./
RUN /bin/bash -c " \
TESTOPTS="${TESTOPTS}" \
./test_regtest.sh 'local' 'ssmp' |& tee report.log && \
rm -rf regtesting"

# Output the report if the image is old and was therefore pulled from the build cache.
CMD cat $(find ./report.log -mmin +10) | sed '/^Summary:/ s/$/ (cached)/'

#EOF

0 comments on commit fd9656a

Please sign in to comment.