From c787a38b10d158f372b90c1c69c5a6fa9030d544 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Fri, 10 Nov 2023 00:50:35 +0000
Subject: [PATCH] feat: heredoc in xl.Dockerfile
---
containers/jug/xl.Dockerfile | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile
index bbe6d3b8c..0ae17fb93 100644
--- a/containers/jug/xl.Dockerfile
+++ b/containers/jug/xl.Dockerfile
@@ -17,8 +17,7 @@ ARG jobs=8
## the date
ARG JUG_VERSION=1
-RUN cd /tmp \
- && echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info
+RUN echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info
## also install detector/ip geometries into opt
ARG NIGHTLY=''
@@ -31,11 +30,11 @@ ADD https://api.github.com/repos/eic/ip6 /tmp/ip6.json
ADD https://api.github.com/repos/eic/epic /tmp/epic.json
COPY setup_detectors.py /tmp
COPY --from=detectors detectors.yaml /tmp
-RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} \
- cd /tmp \
- && export CCACHE_DIR=/ccache \
- && [ "z$NIGHTLY" = "z1" ] && NIGHTLY_FLAG="--nightly" || NIGHTLY_FLAG="" \
- && /tmp/setup_detectors.py --prefix /opt/detector --config /tmp/detectors.yaml \
- $NIGHTLY_FLAG \
- && ccache --show-stats \
- && rm /tmp/setup_detectors.py
+RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} <<EOF
+cd /tmp
+export CCACHE_DIR=/ccache
+[ "z$NIGHTLY" = "z1" ] && NIGHTLY_FLAG="--nightly" || NIGHTLY_FLAG=""
+/tmp/setup_detectors.py --prefix /opt/detector --config /tmp/detectors.yaml $NIGHTLY_FLAG
+ccache --show-stats
+rm /tmp/setup_detectors.py
+EOF
--
GitLab