Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
containers
eic_container
Commits
c5d0c847
Commit
c5d0c847
authored
2 years ago
by
Christopher Dilks
Committed by
Wouter Deconinck
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
irt: rollout `v1.0.5`
parent
1d5ca3e4
No related branches found
No related tags found
1 merge request
!518
irt: rollout `v1.0.5`
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
containers/jug/dev.Dockerfile
+4
-4
4 additions, 4 deletions
containers/jug/dev.Dockerfile
spack.yaml
+1
-1
1 addition, 1 deletion
spack.yaml
with
5 additions
and
5 deletions
containers/jug/dev.Dockerfile
+
4
−
4
View file @
c5d0c847
...
@@ -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
.
\
...
...
This diff is collapsed.
Click to expand it.
spack.yaml
+
1
−
1
View file @
c5d0c847
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment