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

fix: locked cache for spack mirror

parent bbe966f1
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !518. Comments created here will be created in the context of that merge request.
...@@ -58,7 +58,7 @@ RUN declare -A arch=( \ ...@@ -58,7 +58,7 @@ RUN declare -A arch=( \
## Setup spack buildcache mirrors, including an internal ## Setup spack buildcache mirrors, including an internal
## spack mirror using the docker build cache, and ## spack mirror using the docker build cache, and
## a backup mirror on the internal B010 network ## a backup mirror on the internal B010 network
RUN --mount=type=cache,target=/var/cache/spack-mirror \ RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \
export PATH=$PATH:$SPACK_ROOT/bin \ export PATH=$PATH:$SPACK_ROOT/bin \
&& spack mirror add docker /var/cache/spack-mirror \ && spack mirror add docker /var/cache/spack-mirror \
&& spack buildcache update-index -d /var/cache/spack-mirror \ && spack buildcache update-index -d /var/cache/spack-mirror \
...@@ -67,7 +67,7 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \ ...@@ -67,7 +67,7 @@ RUN --mount=type=cache,target=/var/cache/spack-mirror \
## Setup eic-spack buildcache mirrors (FIXME: leaks credentials into layer) ## Setup eic-spack buildcache mirrors (FIXME: leaks credentials into layer)
ARG S3_ACCESS_KEY="" ARG S3_ACCESS_KEY=""
ARG S3_SECRET_KEY="" ARG S3_SECRET_KEY=""
RUN --mount=type=cache,target=/var/cache/spack-mirror \ RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \
export PATH=$PATH:$SPACK_ROOT/bin \ export PATH=$PATH:$SPACK_ROOT/bin \
&& if [ -n "${S3_ACCESS_KEY}" ] ; then \ && if [ -n "${S3_ACCESS_KEY}" ] ; then \
spack mirror add --scope site \ spack mirror add --scope site \
...@@ -117,7 +117,7 @@ RUN rm -r /usr/local \ ...@@ -117,7 +117,7 @@ RUN rm -r /usr/local \
## 2. Get a list of all packages, and compare with what is already on ## 2. Get a list of all packages, and compare with what is already on
## the buildcache (using package hash) ## the buildcache (using package hash)
## 3. Add packages that need to be added to buildcache if any ## 3. Add packages that need to be added to buildcache if any
RUN --mount=type=cache,target=/var/cache/spack-mirror \ RUN --mount=type=cache,target=/var/cache/spack-mirror,sharing=locked \
cd /opt/spack-environment \ cd /opt/spack-environment \
&& source $SPACK_ROOT/share/spack/setup-env.sh \ && source $SPACK_ROOT/share/spack/setup-env.sh \
&& spack env activate . \ && spack env activate . \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment