diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile index 41108659e76e4984926216d66a106bb7b805b24e..b56544576080c2327655a135fd7cdee7787890ce 100644 --- a/containers/jug/dev.Dockerfile +++ b/containers/jug/dev.Dockerfile @@ -108,7 +108,7 @@ RUN git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSP ## ======================================================================================== FROM spack as builder -## Setup our custom environment (secret mount for write-enabled mirror) +## 1. Setup our default environment (secret mount for write-enabled mirror) COPY --from=spack-environment . /opt/spack-environment/ ARG ENV=dev ENV SPACK_ENV=/opt/spack-environment/${ENV} @@ -126,7 +126,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ && ccache --show-stats \ && ccache --zero-stats -## Setup our custom environment with custom versions (on top of cached layer) +## 2. Setup our environment with custom versions (on top of cached layer) ARG JUGGLER_VERSION="" ARG EICRECON_VERSION="" ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json @@ -145,6 +145,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ && if [ -n ${EICRECON_VERSION} ] ; then \ spack rm eicrecon && spack add eicrecon@git.${EICRECON_VERSION} ; \ fi \ + && spack concretize --force --fresh \ && make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ SPACK_ENV=${SPACK_ENV} \ BUILDCACHE_MIRROR="local eics3rw" \