Skip to content
Snippets Groups Projects
Commit c5d0c847 authored by Christopher Dilks's avatar Christopher Dilks Committed by Wouter Deconinck
Browse files

irt: rollout `v1.0.5`

parent 1d5ca3e4
No related branches found
No related tags found
1 merge request!518irt: rollout `v1.0.5`
...@@ -11,7 +11,7 @@ FROM ${DOCKER_REGISTRY}${BASE_IMAGE}:${INTERNAL_TAG} as builder ...@@ -11,7 +11,7 @@ FROM ${DOCKER_REGISTRY}${BASE_IMAGE}:${INTERNAL_TAG} as builder
ARG TARGETPLATFORM ARG TARGETPLATFORM
## install some extra spack dependencies ## 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 \ rm -f /etc/apt/apt.conf.d/docker-clean \
&& apt-get -yqq update \ && apt-get -yqq update \
&& apt-get -yqq install --no-install-recommends \ && apt-get -yqq install --no-install-recommends \
...@@ -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 . \
......
...@@ -27,7 +27,7 @@ spack: ...@@ -27,7 +27,7 @@ spack:
- heppdt@2.06.01 - heppdt@2.06.01
- imagemagick@7.0.8-7 - imagemagick@7.0.8-7
- intel-tbb@2020.3 - intel-tbb@2020.3
- irt@1.0.0 - irt@1.0.5
- jana2@2.0.8 -ipo +root +zmq - jana2@2.0.8 -ipo +root +zmq
- lcov@1.15 - lcov@1.15
- madx@5.08.01 - madx@5.08.01
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment