From c5d0c84700d44083dcf18659432fe6c65bf8716e Mon Sep 17 00:00:00 2001
From: Christopher Dilks <dilks@jlab.org>
Date: Fri, 24 Mar 2023 04:05:32 +0000
Subject: [PATCH] irt: rollout `v1.0.5`
---
containers/jug/dev.Dockerfile | 8 ++++----
spack.yaml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 7d516e06f..911087b51 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -11,7 +11,7 @@ FROM ${DOCKER_REGISTRY}${BASE_IMAGE}:${INTERNAL_TAG} as builder
ARG TARGETPLATFORM
## install some extra spack dependencies
-RUN --mount=type=cache,target=/var/cache/apt \
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
rm -f /etc/apt/apt.conf.d/docker-clean \
&& apt-get -yqq update \
&& apt-get -yqq install --no-install-recommends \
@@ -58,7 +58,7 @@ RUN declare -A arch=( \
## Setup spack buildcache mirrors, including an internal
## spack mirror using the docker build cache, and
## 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 \
&& spack mirror add docker /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 \
## Setup eic-spack buildcache mirrors (FIXME: leaks credentials into layer)
ARG S3_ACCESS_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 \
&& if [ -n "${S3_ACCESS_KEY}" ] ; then \
spack mirror add --scope site \
@@ -117,7 +117,7 @@ RUN rm -r /usr/local \
## 2. Get a list of all packages, and compare with what is already on
## the buildcache (using package hash)
## 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 \
&& source $SPACK_ROOT/share/spack/setup-env.sh \
&& spack env activate . \
diff --git a/spack.yaml b/spack.yaml
index 1c355317c..7aff422ae 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -27,7 +27,7 @@ spack:
- heppdt@2.06.01
- imagemagick@7.0.8-7
- intel-tbb@2020.3
- - irt@1.0.0
+ - irt@1.0.5
- jana2@2.0.8 -ipo +root +zmq
- lcov@1.15
- madx@5.08.01
--
GitLab