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
1ac35881
Commit
1ac35881
authored
4 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
Moved to new container and updated software versions
parent
52cccb86
No related branches found
No related tags found
1 merge request
!15
Updated container and software versions.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
containers/builder/Dockerfile
+8
-8
8 additions, 8 deletions
containers/builder/Dockerfile
containers/builder/spack.yaml
+27
-25
27 additions, 25 deletions
containers/builder/spack.yaml
containers/release/Dockerfile.in
+4
-6
4 additions, 6 deletions
containers/release/Dockerfile.in
with
39 additions
and
39 deletions
containers/builder/Dockerfile
+
8
−
8
View file @
1ac35881
# Builder with Argonne EIC software
#
FROM
eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-20201
025
FROM
eicweb.phy.anl.gov:4567/containers/image_recipes/debian_spack:snapshot-20201
117
LABEL
maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="eic_builder" \
...
...
@@ -11,7 +11,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
ENV
DOCKERFILE_BASE=debian \
DOCKERFILE_DISTRO=debian \
DOCKERFILE_DISTRO_VERSION=20201
012
-testing \
DOCKERFILE_DISTRO_VERSION=20201
117
-testing \
SPACK_ROOT=/opt/spack \
DEBIAN_FRONTEND=noninteractive \
CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
...
...
@@ -24,19 +24,19 @@ RUN apt-get -yqq update \
gv
\
&&
rm
-rf
/var/lib/apt/lists/
*
## Setup our environment definition
COPY
spack.yaml /opt/spack-environment/spack.yaml
## Ensure an up-to-date custom package list
RUN
rm
-rf
$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
snapshot-
`
echo
$(
spack
--version
)
|
cut
-d-
-f3
`
\
&&
git checkout
v
$(
spack
--version
)
\
&&
cd
-
\
&&
echo
"DISABLED: rm -rf
$SPACK_ROOT
/np-spack/.git"
\
&&
echo
"repos:"
>
$SPACK_ROOT
/etc/spack/repos.yaml
\
&&
echo
" -
$SPACK_ROOT
/np-spack"
>>
$SPACK_ROOT
/etc/spack/repos.yaml
## Setup our environment definition
COPY
spack.yaml /opt/spack-environment/spack.yaml
## Install the software, no garbage collection at this stage
## as this is a raw builder image
RUN
cd
/opt/spack-environment
\
...
...
@@ -61,7 +61,7 @@ RUN cd /opt/spack-environment && spack env activate . \
#&& spack install \
#&& spack clean -a
## Strip the binaries
## Strip the binaries
/DISABLED for builder, do this for release step
#RUN find -L /usr/local/* -type f -exec readlink -f '{}' \; | \
# xargs file -i | \
# grep 'charset=binary' | \
...
...
@@ -81,7 +81,7 @@ RUN cd /opt/spack-environment \
&&
spack
env
activate
.
\
&&
export
PODIO
=
`
spack find
-p
podio |
grep
software |
awk
'{print $2}'
`
\
&&
echo
"export PODIO=
${
PODIO
}
;"
>>
/etc/profile.d/z10_spack_environment.sh
\
&&
echo
"export BINARY_TAG=x86_64-linux-gcc
9
-opt"
>>
/etc/profile.d/z10_spack_environment.sh
&&
echo
"export BINARY_TAG=x86_64-linux-gcc
10
-opt"
>>
/etc/profile.d/z10_spack_environment.sh
## make sure we have the entrypoints setup correctly
ENTRYPOINT
[]
...
...
This diff is collapsed.
Click to expand it.
containers/builder/spack.yaml
+
27
−
25
View file @
1ac35881
spack
:
specs
:
-
cmake@3.18.1
-
fmt@6.1.2 cxxstd=17
-
spdlog@1.5.0
-
nlohmann-json
-
heppdt@3.04.01
-
clhep@2.4.1.3 cxxstd=17
-
cairo+fc+ft+X+pdf+gobject
-
eigen@3.3.7
-
python@3.7.8
-
py-pip
-
py-numpy
-
py-pyyaml
-
xrootd@4.12.3 cxxstd=17 +python
-
root@6.22.00 cxxstd=17 +fftw +fortran +gdml +http +mlp +pythia8 +root7 +tmva +vc
+xrootd +ssl ^mesa+opengl -llvm -osmesa
-
pythia8@8244
-
hepmc3@3.2.2 +python +rootio
-
stow@2.2.2
-
podio@master
-
geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
-
dd4hep@1.14.1 +geant4 +assimp +hepmc3
-
acts@1.02.0 +dd4hep +digitization +identification +json +tgeo
-
gaudi@34.0
-
dawn@3_91a
-
dawncut@1_54a
-
cmake@3.18.4
-
fmt@7.1.2 cxxstd=17
-
spdlog@1.5.0
-
nlohmann-json@3.9.1
-
heppdt@3.04.01
-
clhep@2.4.1.3 cxxstd=17
-
eigen@3.3.8
-
python@3.8.6
-
py-pip
-
py-numpy
-
py-pyyaml
-
xrootd@4.12.3 cxxstd=17 +python
-
|
root@6.22.00
cxxstd=17
+fftw +fortran +gdml +http +mlp +pythia8
+root7 +tmva +vc +xrootd +ssl ^mesa+opengl
-llvm -osmesa
-
pythia8@8303
-
hepmc3@3.2.2 +python +rootio
-
stow@2.3.1
-
cairo+fc+ft+X+pdf+gobject
-
podio@master
-
geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
-
dd4hep@1.14.1 +geant4 +assimp +hepmc3
-
acts@2.00.0 +dd4hep +digitization +identification +json +tgeo +ipo
-
gaudi@35.0
-
dawn@3_91a
-
dawncut@1_54a
concretization
:
together
view
:
/usr/local
This diff is collapsed.
Click to expand it.
containers/release/Dockerfile.in
+
4
−
6
View file @
1ac35881
...
...
@@ -11,7 +11,7 @@ RUN find -L /usr/local/* -type f -exec readlink -f '{}' \; | \
grep 'x-executable\|x-archive\|x-sharedlib' | \
awk -F: '{print $1}' | xargs strip -s
FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_minimal:testing-20201
012
FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_minimal:testing-20201
117
LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
name="eic" \
group="eic" \
...
...
@@ -21,14 +21,12 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
## @ENV@ will be automatically expanded to auto-load the
## runtime environment
ENV DOCKERFILE_DISTRO=
ubuntu
\
DOCKERFILE_DISTRO_VERSION=20201
012
-testing \
ENV DOCKERFILE_DISTRO=
debian
\
DOCKERFILE_DISTRO_VERSION=20201
117
-testing \
DEBIAN_FRONTEND=noninteractive \
@ENV@
## TODO: move this to upstream, as we should have ssh available in
## any dev container
## poppler-utils for pdftoppm, is this is right now now supported by the
## poppler-utils for pdftoppm, is this is right now not supported by the
## Spack version
RUN apt-get -yqq update \
&& apt-get -yqq install --no-install-recommends \
...
...
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