Skip to content
Snippets Groups Projects

Repo Cleanup

Merged Repo Cleanup
ujwalk-repo-cleanup into master
Merged Ujwal Kundur requested to merge ujwalk-repo-cleanup into master
Viewing commit 6c5dce59
Show latest version
1 file
+ 5
− 4
Compare changes
  • Side-by-side
  • Inline
  • 6c5dce59
    Ujwal Kundur
    Fix 5 · 6c5dce59
    Ujwal Kundur authored 
    Move CACHE_BUST before COPY spack.yaml command
containers/jug/dev.Dockerfile
+ 5
− 4
@@ -73,6 +73,11 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \
@@ -73,6 +73,11 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \
&& spack mirror add docker /var/cache/spack-mirror \
&& spack mirror add docker /var/cache/spack-mirror \
&& spack mirror list
&& 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
## Setup our custom environment and package overrides
COPY spack $SPACK_ROOT/eic-spack
COPY spack $SPACK_ROOT/eic-spack
RUN spack repo add --scope site "$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" \
@@ -83,10 +88,6 @@ RUN spack repo add --scope site "$SPACK_ROOT/eic-spack" \
&& spack env activate . \
&& spack env activate . \
&& spack concretize
&& 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)
## Now execute the main build (or fetch from cache if possible)
## note, no-check-signature is needed to allow the quicker signature-less
## note, no-check-signature is needed to allow the quicker signature-less