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

fix: reconcretize in stage 2

parent e9bd3715
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !747. Comments created here will be created in the context of that merge request.
...@@ -108,7 +108,7 @@ RUN git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSP ...@@ -108,7 +108,7 @@ RUN git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSP
## ======================================================================================== ## ========================================================================================
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}
...@@ -126,7 +126,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ ...@@ -126,7 +126,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
...@@ -145,6 +145,7 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ ...@@ -145,6 +145,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