From 4873d54ee624a954a8335a383a2e3a21d0f12ff9 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 19 Feb 2023 13:14:52 +0000
Subject: [PATCH] fix: do not expose CCACHE_DIR
---
containers/jug/xl.Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile
index ce9195819..1ecf87156 100644
--- a/containers/jug/xl.Dockerfile
+++ b/containers/jug/xl.Dockerfile
@@ -21,14 +21,13 @@ ARG JUG_VERSION=1
RUN cd /tmp \
&& echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info
-ENV CCACHE_DIR=/ccache/$TARGETPLATFORM
-
ADD ${EICWEB}/369/repository/tree?ref=${JUGGLER_VERSION} /tmp/369.json
RUN --mount=type=cache,target=/ccache/ \
cd /tmp \
&& echo "INSTALLING JUGGLER" \
&& git clone -b ${JUGGLER_VERSION} --depth 1 \
https://eicweb.phy.anl.gov/EIC/juggler.git \
+ && export CCACHE_DIR=/ccache/$TARGETPLATFORM \
&& cmake -B build -S juggler \
-DCMAKE_CXX_FLAGS="-Wno-psabi" \
-DCMAKE_CXX_STANDARD=17 \
@@ -48,6 +47,7 @@ RUN --mount=type=cache,target=/ccache/
&& echo "INSTALLING EICRECON" \
&& git clone -b ${EICRECON_VERSION} --depth 1 \
https://github.com/eic/eicrecon.git \
+ && export CCACHE_DIR=/ccache/$TARGETPLATFORM \
&& cmake -B build -S eicrecon \
-DCMAKE_CXX_FLAGS="-Wno-psabi" \
-DCMAKE_CXX_STANDARD=17 \
@@ -132,6 +132,7 @@ COPY setup_detectors.py /tmp
COPY detectors.yaml /tmp
RUN --mount=type=cache,target=/ccache/ \
cd /tmp \
+ && export CCACHE_DIR=/ccache/$TARGETPLATFORM \
&& [ "z$NIGHTLY" = "z1" ] && NIGHTLY_FLAG="--nightly" || NIGHTLY_FLAG="" \
&& /tmp/setup_detectors.py --prefix /opt/detector --config /tmp/detectors.yaml \
$NIGHTLY_FLAG \
--
GitLab