From 6c5dce5997f50f529d808cef40f087ee2671b5a0 Mon Sep 17 00:00:00 2001 From: Ujwal Kundur <ujwal.kundur@gmail.com> Date: Thu, 23 Jun 2022 16:42:14 +0530 Subject: [PATCH] Fix 5 Move CACHE_BUST before COPY spack.yaml command --- containers/jug/dev.Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index 5275dab1d..639da9aad 100644 --- a/containers/jug/dev.Dockerfile +++ b/containers/jug/dev.Dockerfile @@ -73,6 +73,11 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \ && spack mirror add docker /var/cache/spack-mirror \ && spack mirror list +## This variable will change whenevery either spack.yaml or our spack package +## overrides change, triggering a rebuild +ARG CACHE_BUST="hash" +ARG CACHE_NUKE="" + ## Setup our custom environment and package overrides COPY spack $SPACK_ROOT/eic-spack RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \ @@ -83,10 +88,6 @@ RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \ && spack env activate . \ && spack concretize -## This variable will change whenevery either spack.yaml or our spack package -## overrides change, triggering a rebuild -ARG CACHE_BUST="hash" -ARG CACHE_NUKE="" ## Now execute the main build (or fetch from cache if possible) ## note, no-check-signature is needed to allow the quicker signature-less -- GitLab