From cf49497ce822bcef4ae86f19fc0573e7d3b2b3b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Sch=C3=BCtt?= <ole.schuett@cp2k.org>
Date: Tue, 24 May 2022 00:41:10 +0200
Subject: [PATCH] Docker: Touch up caching

---
 tools/docker/Dockerfile.build_hip_rocm_Mi100       | 1 +
 tools/docker/Dockerfile.build_hip_rocm_Mi50        | 1 +
 tools/docker/Dockerfile.test_aiida                 | 1 +
 tools/docker/Dockerfile.test_ase                   | 1 +
 tools/docker/Dockerfile.test_conventions           | 1 +
 tools/docker/Dockerfile.test_coverage-pdbg         | 1 +
 tools/docker/Dockerfile.test_coverage-sdbg         | 1 +
 tools/docker/Dockerfile.test_cuda_A100             | 3 ++-
 tools/docker/Dockerfile.test_cuda_P100             | 3 ++-
 tools/docker/Dockerfile.test_cuda_V100             | 3 ++-
 tools/docker/Dockerfile.test_doxygen               | 1 +
 tools/docker/Dockerfile.test_gcc10                 | 3 ++-
 tools/docker/Dockerfile.test_gcc11                 | 3 ++-
 tools/docker/Dockerfile.test_gcc12                 | 3 ++-
 tools/docker/Dockerfile.test_gcc7                  | 3 ++-
 tools/docker/Dockerfile.test_gcc8                  | 3 ++-
 tools/docker/Dockerfile.test_gcc9                  | 3 ++-
 tools/docker/Dockerfile.test_generic_pdbg          | 3 ++-
 tools/docker/Dockerfile.test_generic_psmp          | 3 ++-
 tools/docker/Dockerfile.test_generic_sdbg          | 3 ++-
 tools/docker/Dockerfile.test_generic_ssmp          | 3 ++-
 tools/docker/Dockerfile.test_gromacs               | 1 +
 tools/docker/Dockerfile.test_hip_cuda_A100         | 3 ++-
 tools/docker/Dockerfile.test_hip_cuda_P100         | 3 ++-
 tools/docker/Dockerfile.test_hip_cuda_V100         | 3 ++-
 tools/docker/Dockerfile.test_i-pi                  | 1 +
 tools/docker/Dockerfile.test_i386                  | 3 ++-
 tools/docker/Dockerfile.test_intel-psmp            | 6 ++----
 tools/docker/Dockerfile.test_manual                | 1 +
 tools/docker/Dockerfile.test_minimal               | 3 ++-
 tools/docker/Dockerfile.test_openmpi-psmp          | 3 ++-
 tools/docker/Dockerfile.test_pdbg                  | 3 ++-
 tools/docker/Dockerfile.test_performance           | 1 +
 tools/docker/Dockerfile.test_performance_cuda_A100 | 1 +
 tools/docker/Dockerfile.test_performance_cuda_P100 | 1 +
 tools/docker/Dockerfile.test_performance_cuda_V100 | 1 +
 tools/docker/Dockerfile.test_precommit             | 1 +
 tools/docker/Dockerfile.test_psmp                  | 3 ++-
 tools/docker/Dockerfile.test_python                | 1 +
 tools/docker/Dockerfile.test_sdbg                  | 3 ++-
 tools/docker/Dockerfile.test_ssmp                  | 3 ++-
 tools/docker/generate_dockerfiles.py               | 6 ++----
 42 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/tools/docker/Dockerfile.build_hip_rocm_Mi100 b/tools/docker/Dockerfile.build_hip_rocm_Mi100
index f8279d8289..e6d5325c2f 100644
--- a/tools/docker/Dockerfile.build_hip_rocm_Mi100
+++ b/tools/docker/Dockerfile.build_hip_rocm_Mi100
@@ -98,5 +98,6 @@ RUN ./test_build.sh "local_hip" "psmp" 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.build_hip_rocm_Mi50 b/tools/docker/Dockerfile.build_hip_rocm_Mi50
index 5a238579af..f519e92648 100644
--- a/tools/docker/Dockerfile.build_hip_rocm_Mi50
+++ b/tools/docker/Dockerfile.build_hip_rocm_Mi50
@@ -98,5 +98,6 @@ RUN ./test_build.sh "local_hip" "psmp" 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_aiida b/tools/docker/Dockerfile.test_aiida
index 986c118432..8d9dbe8855 100644
--- a/tools/docker/Dockerfile.test_aiida
+++ b/tools/docker/Dockerfile.test_aiida
@@ -82,5 +82,6 @@ RUN ./test_aiida.sh 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_ase b/tools/docker/Dockerfile.test_ase
index c13d76bd16..85af66d6d1 100644
--- a/tools/docker/Dockerfile.test_ase
+++ b/tools/docker/Dockerfile.test_ase
@@ -82,5 +82,6 @@ RUN ./test_ase.sh 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_conventions b/tools/docker/Dockerfile.test_conventions
index e8682030ab..93311be1e5 100644
--- a/tools/docker/Dockerfile.test_conventions
+++ b/tools/docker/Dockerfile.test_conventions
@@ -87,5 +87,6 @@ RUN /bin/bash -ec " \
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_coverage-pdbg b/tools/docker/Dockerfile.test_coverage-pdbg
index 3bc81c99aa..7b65a2ee28 100644
--- a/tools/docker/Dockerfile.test_coverage-pdbg
+++ b/tools/docker/Dockerfile.test_coverage-pdbg
@@ -83,5 +83,6 @@ RUN ./test_coverage.sh "pdbg" 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_coverage-sdbg b/tools/docker/Dockerfile.test_coverage-sdbg
index 4dbbd04c38..039e23962a 100644
--- a/tools/docker/Dockerfile.test_coverage-sdbg
+++ b/tools/docker/Dockerfile.test_coverage-sdbg
@@ -82,5 +82,6 @@ RUN ./test_coverage.sh "sdbg" 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_cuda_A100 b/tools/docker/Dockerfile.test_cuda_A100
index 56eb278b83..fd1fd49559 100644
--- a/tools/docker/Dockerfile.test_cuda_A100
+++ b/tools/docker/Dockerfile.test_cuda_A100
@@ -91,12 +91,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local_cuda' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_cuda_P100 b/tools/docker/Dockerfile.test_cuda_P100
index 7c3370d52b..b9996d7d4f 100644
--- a/tools/docker/Dockerfile.test_cuda_P100
+++ b/tools/docker/Dockerfile.test_cuda_P100
@@ -91,12 +91,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local_cuda' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_cuda_V100 b/tools/docker/Dockerfile.test_cuda_V100
index 6dfce936b0..fdcaeef360 100644
--- a/tools/docker/Dockerfile.test_cuda_V100
+++ b/tools/docker/Dockerfile.test_cuda_V100
@@ -91,12 +91,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local_cuda' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_doxygen b/tools/docker/Dockerfile.test_doxygen
index 1e3545f5d3..5f64850156 100644
--- a/tools/docker/Dockerfile.test_doxygen
+++ b/tools/docker/Dockerfile.test_doxygen
@@ -25,5 +25,6 @@ RUN ./test_doxygen.sh 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_gcc10 b/tools/docker/Dockerfile.test_gcc10
index 023488f7f6..68546082e8 100644
--- a/tools/docker/Dockerfile.test_gcc10
+++ b/tools/docker/Dockerfile.test_gcc10
@@ -105,12 +105,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_gcc11 b/tools/docker/Dockerfile.test_gcc11
index eb3477d6a3..8de3657232 100644
--- a/tools/docker/Dockerfile.test_gcc11
+++ b/tools/docker/Dockerfile.test_gcc11
@@ -105,12 +105,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_gcc12 b/tools/docker/Dockerfile.test_gcc12
index b76afe5641..b37db9564c 100644
--- a/tools/docker/Dockerfile.test_gcc12
+++ b/tools/docker/Dockerfile.test_gcc12
@@ -105,12 +105,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_gcc7 b/tools/docker/Dockerfile.test_gcc7
index db73a33143..cfa408415c 100644
--- a/tools/docker/Dockerfile.test_gcc7
+++ b/tools/docker/Dockerfile.test_gcc7
@@ -105,12 +105,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_gcc8 b/tools/docker/Dockerfile.test_gcc8
index 8a6c2d117f..7a26b51129 100644
--- a/tools/docker/Dockerfile.test_gcc8
+++ b/tools/docker/Dockerfile.test_gcc8
@@ -105,12 +105,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_gcc9 b/tools/docker/Dockerfile.test_gcc9
index b8bb7e7ed3..0888ec9d7e 100644
--- a/tools/docker/Dockerfile.test_gcc9
+++ b/tools/docker/Dockerfile.test_gcc9
@@ -105,12 +105,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_generic_pdbg b/tools/docker/Dockerfile.test_generic_pdbg
index 22f892ca65..a5984b3d46 100644
--- a/tools/docker/Dockerfile.test_generic_pdbg
+++ b/tools/docker/Dockerfile.test_generic_pdbg
@@ -81,12 +81,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'pdbg' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_generic_psmp b/tools/docker/Dockerfile.test_generic_psmp
index 90b7759fff..b78f24e9f4 100644
--- a/tools/docker/Dockerfile.test_generic_psmp
+++ b/tools/docker/Dockerfile.test_generic_psmp
@@ -81,12 +81,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_generic_sdbg b/tools/docker/Dockerfile.test_generic_sdbg
index 3e97522ced..fb22f210c3 100644
--- a/tools/docker/Dockerfile.test_generic_sdbg
+++ b/tools/docker/Dockerfile.test_generic_sdbg
@@ -80,12 +80,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'sdbg' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_generic_ssmp b/tools/docker/Dockerfile.test_generic_ssmp
index 2bdcf4e5e7..60afa4c0dd 100644
--- a/tools/docker/Dockerfile.test_generic_ssmp
+++ b/tools/docker/Dockerfile.test_generic_ssmp
@@ -80,12 +80,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_gromacs b/tools/docker/Dockerfile.test_gromacs
index 70790cca83..81b3100ed8 100644
--- a/tools/docker/Dockerfile.test_gromacs
+++ b/tools/docker/Dockerfile.test_gromacs
@@ -82,5 +82,6 @@ RUN ./test_gromacs.sh 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_hip_cuda_A100 b/tools/docker/Dockerfile.test_hip_cuda_A100
index 2a22d48e43..e04397173f 100644
--- a/tools/docker/Dockerfile.test_hip_cuda_A100
+++ b/tools/docker/Dockerfile.test_hip_cuda_A100
@@ -173,12 +173,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local_hip' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_hip_cuda_P100 b/tools/docker/Dockerfile.test_hip_cuda_P100
index 60d515b66a..efe4c40bbf 100644
--- a/tools/docker/Dockerfile.test_hip_cuda_P100
+++ b/tools/docker/Dockerfile.test_hip_cuda_P100
@@ -173,12 +173,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local_hip' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_hip_cuda_V100 b/tools/docker/Dockerfile.test_hip_cuda_V100
index ecab2e65c1..f37143e05b 100644
--- a/tools/docker/Dockerfile.test_hip_cuda_V100
+++ b/tools/docker/Dockerfile.test_hip_cuda_V100
@@ -173,12 +173,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local_hip' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_i-pi b/tools/docker/Dockerfile.test_i-pi
index e2fbf9852f..c1b1e272fb 100644
--- a/tools/docker/Dockerfile.test_i-pi
+++ b/tools/docker/Dockerfile.test_i-pi
@@ -82,5 +82,6 @@ RUN ./test_i-pi.sh 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_i386 b/tools/docker/Dockerfile.test_i386
index 3e20c52d14..55d01b537b 100644
--- a/tools/docker/Dockerfile.test_i386
+++ b/tools/docker/Dockerfile.test_i386
@@ -105,12 +105,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_intel-psmp b/tools/docker/Dockerfile.test_intel-psmp
index e4a38227b6..f6e24a8f2c 100644
--- a/tools/docker/Dockerfile.test_intel-psmp
+++ b/tools/docker/Dockerfile.test_intel-psmp
@@ -10,9 +10,6 @@ ENV LD_LIBRARY_PATH=/opt/intel/oneapi/mpi/2021.4.0/lib/release:/opt/intel/oneapi
 ENV MKLROOT=/opt/intel/oneapi/mkl/2021.4.0
 ENV I_MPI_ROOT=/opt/intel/oneapi/mpi/2021.4.0
 ENV FI_PROVIDER_PATH='/opt/intel/oneapi/mpi/2021.4.0/libfabric/lib/prov'
-
-ENTRYPOINT []
-
 # Install requirements for the toolchain.
 WORKDIR /opt/cp2k-toolchain
 COPY ./tools/toolchain/install_requirements*.sh ./
@@ -94,12 +91,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS="--mpiranks=1"
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_manual b/tools/docker/Dockerfile.test_manual
index 5d96a2d538..062dfe7934 100644
--- a/tools/docker/Dockerfile.test_manual
+++ b/tools/docker/Dockerfile.test_manual
@@ -87,5 +87,6 @@ RUN ./test_manual.sh 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_minimal b/tools/docker/Dockerfile.test_minimal
index 69f2252d68..c533bc06d6 100644
--- a/tools/docker/Dockerfile.test_minimal
+++ b/tools/docker/Dockerfile.test_minimal
@@ -78,12 +78,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'minimal' 'sdbg' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_openmpi-psmp b/tools/docker/Dockerfile.test_openmpi-psmp
index f42e57cb77..d6313e6e9d 100644
--- a/tools/docker/Dockerfile.test_openmpi-psmp
+++ b/tools/docker/Dockerfile.test_openmpi-psmp
@@ -80,12 +80,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_pdbg b/tools/docker/Dockerfile.test_pdbg
index e65af0a934..3a11cd225c 100644
--- a/tools/docker/Dockerfile.test_pdbg
+++ b/tools/docker/Dockerfile.test_pdbg
@@ -80,12 +80,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'pdbg' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_performance b/tools/docker/Dockerfile.test_performance
index 0993559b52..23af478a52 100644
--- a/tools/docker/Dockerfile.test_performance
+++ b/tools/docker/Dockerfile.test_performance
@@ -86,5 +86,6 @@ RUN ./test_performance.sh "local" 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_performance_cuda_A100 b/tools/docker/Dockerfile.test_performance_cuda_A100
index 40e10c773e..0fc0216777 100644
--- a/tools/docker/Dockerfile.test_performance_cuda_A100
+++ b/tools/docker/Dockerfile.test_performance_cuda_A100
@@ -97,5 +97,6 @@ RUN ./test_performance.sh "local_cuda" 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_performance_cuda_P100 b/tools/docker/Dockerfile.test_performance_cuda_P100
index a1765ddd63..7f4f68689e 100644
--- a/tools/docker/Dockerfile.test_performance_cuda_P100
+++ b/tools/docker/Dockerfile.test_performance_cuda_P100
@@ -97,5 +97,6 @@ RUN ./test_performance.sh "local_cuda" 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_performance_cuda_V100 b/tools/docker/Dockerfile.test_performance_cuda_V100
index 759b17ceea..88eb5c586b 100644
--- a/tools/docker/Dockerfile.test_performance_cuda_V100
+++ b/tools/docker/Dockerfile.test_performance_cuda_V100
@@ -97,5 +97,6 @@ RUN ./test_performance.sh "local_cuda" 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_precommit b/tools/docker/Dockerfile.test_precommit
index efbd4107f0..07d657f1fd 100644
--- a/tools/docker/Dockerfile.test_precommit
+++ b/tools/docker/Dockerfile.test_precommit
@@ -19,5 +19,6 @@ RUN ./tools/docker/scripts/test_precommit.sh 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_psmp b/tools/docker/Dockerfile.test_psmp
index 369234b49b..948987c970 100644
--- a/tools/docker/Dockerfile.test_psmp
+++ b/tools/docker/Dockerfile.test_psmp
@@ -80,12 +80,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'psmp' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_python b/tools/docker/Dockerfile.test_python
index 16a560c2eb..3595f63cb4 100644
--- a/tools/docker/Dockerfile.test_python
+++ b/tools/docker/Dockerfile.test_python
@@ -25,5 +25,6 @@ RUN ./test_python.sh 2>&1 | tee report.log
 
 # 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_sdbg b/tools/docker/Dockerfile.test_sdbg
index 64f6e630f1..67f18e81cc 100644
--- a/tools/docker/Dockerfile.test_sdbg
+++ b/tools/docker/Dockerfile.test_sdbg
@@ -79,12 +79,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'sdbg' |& 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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/Dockerfile.test_ssmp b/tools/docker/Dockerfile.test_ssmp
index 49b248c8a3..a907109457 100644
--- a/tools/docker/Dockerfile.test_ssmp
+++ b/tools/docker/Dockerfile.test_ssmp
@@ -79,12 +79,13 @@ COPY ./tools/regtesting ./tools/regtesting
 # Run regression tests.
 ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -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)/'
+ENTRYPOINT []
 
 #EOF
diff --git a/tools/docker/generate_dockerfiles.py b/tools/docker/generate_dockerfiles.py
index 468430e87c..c89fa78512 100755
--- a/tools/docker/generate_dockerfiles.py
+++ b/tools/docker/generate_dockerfiles.py
@@ -104,7 +104,7 @@ def regtest(version: str, arch: str = "local", testopts: str = "") -> str:
 # Run regression tests.
 ARG TESTOPTS="{testopts}"
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${{TESTOPTS}}" \
     ./test_regtest.sh '{arch}' '{version}' |& tee report.log && \
     rm -rf regtesting"
@@ -271,6 +271,7 @@ def print_cached_report() -> str:
     return r"""
 # 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)/'
+ENTRYPOINT []
 
 #EOF
 """
@@ -424,9 +425,6 @@ ENV LD_LIBRARY_PATH=/opt/intel/oneapi/mpi/2021.4.0/lib/release:/opt/intel/oneapi
 ENV MKLROOT=/opt/intel/oneapi/mkl/2021.4.0
 ENV I_MPI_ROOT=/opt/intel/oneapi/mpi/2021.4.0
 ENV FI_PROVIDER_PATH='/opt/intel/oneapi/mpi/2021.4.0/libfabric/lib/prov'
-
-ENTRYPOINT []
-
 """ + install_toolchain(
         base_image="ubuntu",
         with_intel="",