From 9724d7890c80bb2eee92e678961968b8277e8dba Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Fri, 25 Sep 2020 20:44:15 +0000
Subject: [PATCH] Updated readme and moved release container to debian base
---
README.md | 14 ++++++++------
containers/builder/spack.yaml | 2 ++
containers/release/Dockerfile.in | 12 ++++++------
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 21bd852a4..9167e063c 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ cd eic_container
modeuefile will be installed to `$PREFIX/../../etc/modulefiles`.
You can use the `-v` flag to select the version you want to deploy, or omit the
flag if you want to install the master build. The recommended stable
- release version is `v2.1.3`.
+ release version is `v2.2.0`.
```bash
-./deploy.py -v 2.1.3 <PREFIX>
+./deploy.py -v 2.2.0 <PREFIX>
```
Available flags:
@@ -101,15 +101,15 @@ $PREFIX/bin/eic-shell
Included software:
------------------
- Included software:
- - gcc@9.3.0
- - cmake@3.17.3
+ - gcc@10.2.0
+ - cmake@3.18.1
- fmt@6.1.2
- spdlog@1.5.0
- nlohmann-json
- heppdt@3.04.01
- clhep@2.4.1.3
- eigen@3.3.7
- - python@3.7.7 with pip, numpy, pyyaml, pyafp, matplotlib, ipython, scipy
+ - python@3.7.8 with pip, numpy, pyyaml, pyafp, matplotlib, ipython, scipy
- xrootd@4.12.3
- root@6.22.00
- pythia8@8244
@@ -117,8 +117,10 @@ Included software:
- podio@master
- geant4@10.6.2
- dd4hep@1.13.1
- - acts@0.31.0
+ - acts@1.00.0
- gaudi@34.0
+ - dawn@3.91a
+ - dawncut@1.54a
- The singularity build exports the following applications:
- eic_shell: a development shell in the image
- container_dev: same as EIC shell
diff --git a/containers/builder/spack.yaml b/containers/builder/spack.yaml
index a82859a14..afcd7cf54 100644
--- a/containers/builder/spack.yaml
+++ b/containers/builder/spack.yaml
@@ -22,6 +22,8 @@ spack:
- dd4hep@1.13.1 +geant4 +assimp +hepmc3
- acts@1.00.0 +dd4hep +digitization +identification +json +tgeo
- gaudi@34.0
+ - dawn@3_91a
+ - dawncut@1_54a
concretization: together
config:
install_tree: /opt/software
diff --git a/containers/release/Dockerfile.in b/containers/release/Dockerfile.in
index 77bf2c656..1973d8260 100644
--- a/containers/release/Dockerfile.in
+++ b/containers/release/Dockerfile.in
@@ -11,18 +11,18 @@ 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/ubuntu_minimal:20.04
+FROM eicweb.phy.anl.gov:4567/containers/image_recipes/debian_minimal:testing-20200908
LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
- name="eic_container" \
- group="eic_container" \
+ name="eic" \
+ group="eic" \
march="native" \
- basedist="ubuntu" \
- base="ubuntu"
+ basedist="debian" \
+ base="debian"
## @ENV@ will be automatically expanded to auto-load the
## runtime environment
ENV DOCKERFILE_DISTRO=ubuntu \
- DOCKERFILE_DISTRO_VERSION=20.04 \
+ DOCKERFILE_DISTRO_VERSION=20200908-testing \
DEBIAN_FRONTEND=noninteractive \
@ENV@
--
GitLab