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
d72d10a1
Commit
d72d10a1
authored
4 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
Updated container, acts@1.00.0, add ghostscript/gv
parent
4b527332
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!10
New v2.2.0 release version
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
containers/builder/Dockerfile
+14
-5
14 additions, 5 deletions
containers/builder/Dockerfile
containers/builder/spack.yaml
+1
-1
1 addition, 1 deletion
containers/builder/spack.yaml
containers/release/Dockerfile.in
+2
-0
2 additions, 0 deletions
containers/release/Dockerfile.in
with
17 additions
and
6 deletions
containers/builder/Dockerfile
+
14
−
5
View file @
d72d10a1
# Builder with Argonne EIC software
# Builder with Argonne EIC software
#
#
FROM
eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:
0.15.4
FROM
eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:
snapshot-20200922
LABEL
maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
LABEL
maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="eic_builder" \
name="eic_builder" \
...
@@ -11,17 +11,26 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
...
@@ -11,17 +11,26 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
ENV
DOCKERFILE_BASE=debian \
ENV
DOCKERFILE_BASE=debian \
DOCKERFILE_DISTRO=debian \
DOCKERFILE_DISTRO=debian \
DOCKERFILE_DISTRO_VERSION=20200
803
-testing \
DOCKERFILE_DISTRO_VERSION=20200
908
-testing \
SPACK_ROOT=/opt/spack \
SPACK_ROOT=/opt/spack \
DEBIAN_FRONTEND=noninteractive \
DEBIAN_FRONTEND=noninteractive \
CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
container=docker
container=docker
## install ghostview/ghostscript needed by some of the tools
RUN
apt-get
-yqq
update
\
&&
apt-get
-yqq
install
--no-install-recommends
\
ghostscript
\
gv
\
&&
rm
-rf
/var/lib/apt/lists/
*
## Ensure an up-to-date custom package list
## Ensure an up-to-date custom package list
RUN
rm
-rf
$SPACK_ROOT
/np-spack
\
RUN
rm
-rf
$SPACK_ROOT
/np-spack
\
&&
git clone https://eicweb.phy.anl.gov/EIC/np-spack.git
$SPACK_ROOT
/np-spack
\
&&
git clone https://eicweb.phy.anl.gov/EIC/np-spack.git
$SPACK_ROOT
/np-spack
\
&&
cd
$SPACK_ROOT
/np-spack
&&
git checkout v
`
spack
--version
`
&&
cd
-
\
&&
cd
$SPACK_ROOT
/np-spack
\
&&
rm
-rf
$SPACK_ROOT
/np-spack/.git
\
&&
git checkout snapshot-
`
echo
$(
spack
--version
)
|
cut
-d-
-f3
`
\
&&
cd
-
\
&&
echo
"DISABLED: rm -rf
$SPACK_ROOT
/np-spack/.git"
\
&&
echo
"repos:"
>
$SPACK_ROOT
/etc/spack/repos.yaml
\
&&
echo
"repos:"
>
$SPACK_ROOT
/etc/spack/repos.yaml
\
&&
echo
" -
$SPACK_ROOT
/np-spack"
>>
$SPACK_ROOT
/etc/spack/repos.yaml
&&
echo
" -
$SPACK_ROOT
/np-spack"
>>
$SPACK_ROOT
/etc/spack/repos.yaml
...
@@ -32,7 +41,7 @@ COPY spack.yaml /opt/spack-environment/spack.yaml
...
@@ -32,7 +41,7 @@ COPY spack.yaml /opt/spack-environment/spack.yaml
## as this is a raw builder image
## as this is a raw builder image
RUN
cd
/opt/spack-environment
\
RUN
cd
/opt/spack-environment
\
&&
spack
env
activate
.
\
&&
spack
env
activate
.
\
&&
spack
install
-j
32
\
&&
spack
install
-j
64
\
&&
spack clean
-a
&&
spack clean
-a
## Install additional python packages
## Install additional python packages
...
...
This diff is collapsed.
Click to expand it.
containers/builder/spack.yaml
+
1
−
1
View file @
d72d10a1
...
@@ -19,7 +19,7 @@ spack:
...
@@ -19,7 +19,7 @@ spack:
-
podio@master
-
podio@master
-
geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
-
geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
-
dd4hep@1.13.1 +geant4 +assimp +hepmc3
-
dd4hep@1.13.1 +geant4 +assimp +hepmc3
-
acts@
0.31
.0 +dd4hep +digitization +identification +json +tgeo
-
acts@
1.00
.0 +dd4hep +digitization +identification +json +tgeo
-
gaudi@34.0
-
gaudi@34.0
concretization
:
together
concretization
:
together
config
:
config
:
...
...
This diff is collapsed.
Click to expand it.
containers/release/Dockerfile.in
+
2
−
0
View file @
d72d10a1
...
@@ -31,6 +31,8 @@ ENV DOCKERFILE_DISTRO=ubuntu \
...
@@ -31,6 +31,8 @@ ENV DOCKERFILE_DISTRO=ubuntu \
RUN apt-get -yqq update \
RUN apt-get -yqq update \
&& apt-get -yqq install --no-install-recommends \
&& apt-get -yqq install --no-install-recommends \
openssh-client \
openssh-client \
ghostscript \
gv \
&& locale-gen en_US.UTF-8 \
&& locale-gen en_US.UTF-8 \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/*
...
...
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