From 026a55ffeb7c4cfef362fbddccf0d6bd98ac20a0 Mon Sep 17 00:00:00 2001 From: Matthias Krack Date: Mon, 9 Feb 2026 19:04:04 +0100 Subject: [PATCH] Sync CI docker files (launch script name) --- ci/docker/build_cp2k_spack.Dockerfile | 9 +++------ ci/docker/build_deps_spack.Dockerfile | 4 +--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ci/docker/build_cp2k_spack.Dockerfile b/ci/docker/build_cp2k_spack.Dockerfile index 02d0176e7a..649203ea80 100644 --- a/ci/docker/build_cp2k_spack.Dockerfile +++ b/ci/docker/build_cp2k_spack.Dockerfile @@ -25,11 +25,8 @@ RUN /bin/bash -o pipefail -c "source ./make_cp2k.sh -cv ${CP2K_VERSION} -dlc -j$ FROM "${BASE_IMAGE}" AS install_cp2k -# Install required packages RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ - g++ \ - gcc \ - gfortran \ + g++ gcc gfortran \ python3 \ && rm -rf /var/lib/apt/lists/* @@ -50,5 +47,5 @@ COPY --from=build_cp2k /opt/cp2k/benchmarks/CI ./benchmarks/CI # Create entrypoint and finalise container build WORKDIR /mnt -ENTRYPOINT ["/opt/cp2k/install/bin/entrypoint.sh"] -CMD ["cp2k", "--help"] +ENTRYPOINT ["/opt/cp2k/install/bin/launch"] +CMD ["cp2k", "--help", "--version"] diff --git a/ci/docker/build_deps_spack.Dockerfile b/ci/docker/build_deps_spack.Dockerfile index 6b9207f416..93d3694867 100644 --- a/ci/docker/build_deps_spack.Dockerfile +++ b/ci/docker/build_deps_spack.Dockerfile @@ -16,9 +16,7 @@ RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ bzip2 \ ca-certificates \ cmake \ - g++ \ - gcc \ - gfortran \ + g++ gcc gfortran \ git \ gnupg \ libssh-dev \