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

Fix creation of C2PK build log file

Browse source
This commit is contained in:
Matthias Krack 2025-05-12 12:21:50 +02:00
parent fb57fb5c38
commit 00613676dc
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ci/docker/build_cp2k_spack.Dockerfile
View file

@ -29,6 +29,8 @@ COPY ./tools/build_utils ./tools/build_utils
RUN /bin/bash -c -o pipefail "source ./cmake/cmake_cp2k.sh spack_${CP2K_BUILD_TYPE} ${CP2K_VERSION}"
# Compile CP2K
ARG LOG_LINES
ENV LOG_LINES=${LOG_LINES:-200}
WORKDIR /opt/cp2k/build
RUN /bin/bash -c -o pipefail " \
echo -e '\nCompiling CP2K ... \c'; \
@ -41,11 +43,12 @@ RUN /bin/bash -c -o pipefail " \
echo -e 'failed\n'; \
tail -n ${LOG_LINES} install.log; \
fi; \
cat cmake.log ninja.log install.log | gzip >build_cp2k.log.gz; \
else \
echo -e 'failed\n'; \
tail -n ${LOG_LINES} ninja.log; \
fi; \
cat cmake.log ninja.log install.log | gzip >build_cp2k.log.gz"
cat cmake.log ninja.log | gzip >build_cp2k.log.gz; \
fi"
# Stage 2b: Install CP2K
FROM ${BASE_IMAGE} AS install_cp2k

7
ci/docker/build_cp2k_toolchain.Dockerfile
View file

@ -31,6 +31,8 @@ RUN /bin/bash -c -o pipefail " \
source ./cmake/cmake_cp2k.sh toolchain_${CP2K_BUILD_TYPE} ${CP2K_VERSION}"
# Compile CP2K
ARG LOG_LINES
ENV LOG_LINES=${LOG_LINES:-200}
WORKDIR /opt/cp2k/build
RUN /bin/bash -c -o pipefail " \
source /opt/cp2k/tools/toolchain/install/setup; \
@ -44,11 +46,12 @@ RUN /bin/bash -c -o pipefail " \
echo -e 'failed\n'; \
tail -n ${LOG_LINES} install.log; \
fi; \
cat cmake.log ninja.log install.log | gzip >build_cp2k.log.gz; \
else \
echo -e 'failed\n'; \
tail -n ${LOG_LINES} ninja.log; \
fi; \
cat cmake.log ninja.log install.log | gzip >build_cp2k.log.gz"
cat cmake.log ninja.log | gzip >build_cp2k.log.gz; \
fi"
# Update library search path
RUN echo "/opt/cp2k/lib" >/etc/ld.so.conf.d/cp2k.conf && ldconfig