From cc7f4e6d501b0b2fd60a967569dd768cd3d8dedb Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Wed, 5 Apr 2023 00:11:05 +0000
Subject: [PATCH] fix: use cache mount for make step
---
containers/jug/dev.Dockerfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 2a3e86390..acb55a9da 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -100,8 +100,9 @@ RUN git clone https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT} \
## Setup our custom environment
COPY --from=spack spack-environment/ /opt/spack-environment/
ARG ENV=dev
-RUN rm -r /usr/local \
- && cd /opt/spack-environment \
+RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \
+ cd /opt/spack-environment \
+ && rm -r /usr/local \
&& source $SPACK_ROOT/share/spack/setup-env.sh \
&& spack env activate --dir /opt/spack-environment/${ENV} \
&& make -C /opt/spack-environment --keep-going SPACK_ENV=${ENV} \
@@ -112,9 +113,8 @@ RUN rm -r /usr/local \
## This is useful when going to completely different containers,
## or intermittently to keep the buildcache step from taking too much time
RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \
- cd /opt/spack-environment \
- && [ -z "${CACHE_NUKE}" ] \
- || rm -rf /var/cache/spack-mirror/build_cache/* \
+ [ -z "${CACHE_NUKE}" ] \
+ || rm -rf /var/cache/spack-mirror/build_cache/*
## Extra post-spack steps:
## - Python packages
--
GitLab