Skip to content
Snippets Groups Projects
Commit 30f50d58 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: reconcretize in stage 2

parent 3c01d46a
No related branches found
No related tags found
No related merge requests found
...@@ -117,7 +117,7 @@ RUN git clone --filter=tree:0 https://github.com/${KEY4HEPSPACK_ORGREPO}.git ${K ...@@ -117,7 +117,7 @@ RUN git clone --filter=tree:0 https://github.com/${KEY4HEPSPACK_ORGREPO}.git ${K
## ======================================================================================== ## ========================================================================================
FROM spack as builder 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/ COPY --from=spack-environment . /opt/spack-environment/
ARG ENV=dev ARG ENV=dev
ENV SPACK_ENV=/opt/spack-environment/${ENV} ENV SPACK_ENV=/opt/spack-environment/${ENV}
...@@ -135,7 +135,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ ...@@ -135,7 +135,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
&& ccache --show-stats \ && ccache --show-stats \
&& ccache --zero-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 JUGGLER_VERSION=""
ARG EICRECON_VERSION="" ARG EICRECON_VERSION=""
ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json ADD https://eicweb.phy.anl.gov/api/v4/projects/EIC%2Fjuggler/repository/tree?ref=${JUGGLER_VERSION} /tmp/juggler.json
...@@ -154,6 +154,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ ...@@ -154,6 +154,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
&& if [ -n ${EICRECON_VERSION} ] ; then \ && if [ -n ${EICRECON_VERSION} ] ; then \
spack rm eicrecon && spack add eicrecon@git.${EICRECON_VERSION} ; \ spack rm eicrecon && spack add eicrecon@git.${EICRECON_VERSION} ; \
fi \ fi \
&& spack concretize --force --fresh \
&& make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ && make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
SPACK_ENV=${SPACK_ENV} \ SPACK_ENV=${SPACK_ENV} \
BUILDCACHE_MIRROR="local eics3rw" \ BUILDCACHE_MIRROR="local eics3rw" \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment