Prepare release 2.1.0

.gitlab-ci.yml

@@ -100,7 +100,7 @@ release_unstable:
 builder_singularity:
   stage: singularity
   tags:
-     - sodium dind
+     - singularity
   only:
      - staging
      - tags
@@ -120,7 +120,7 @@ builder_singularity:
 release_singularity:
   stage: singularity
   tags:
-     - sodium dind
+     - singularity
   only:
      - staging
      - tags

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.0.4`.
+   release version is `v2.1.0`.
 ```bash
-./deploy.py -v 2.0.4 <PREFIX>
+./deploy.py -v 2.1.0 <PREFIX>
 ```
 
    Available flags:
@@ -109,18 +109,19 @@ Included software:
     - heppdt@3.04.01
     - clhep@2.4.1.3
     - eigen@3.3.7
-    - python@3.7.7 with pip, numpy, pyyaml, matplotlib, ipython, scipy
+    - python@3.7.7 with pip, numpy, pyyaml, pyafp,  matplotlib, ipython, scipy
     - xrootd@4.12.3
     - root@6.22.00
     - pythia8@8244
     - hepmc3@3.2.2 +python +rootio
-    - podio@0.10.0
+    - podio@0.11.0
     - geant4@10.6.2
-    - dd4hep@1.13.0
-    - acts@0.27.1
+    - dd4hep@1.13.1
+    - acts@0.29.0
     - gaudi@33.2
     - NPDet development version
   - The singularity build exports the following applications:
     - eic_shell: a development shell in the image
+    - container_dev: same as EIC shell
     - root
     - ipython

containers/builder/'

-# Builder with Argonne EIC software
-#
-FROM eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_spack:0.15.3
-
-LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
-      name="eic_builder" \
-      group="eic_builder" \
-      march="native" \
-      basedist="ubuntu" \
-      base="ubuntu"
-
-ENV DOCKERFILE_BASE=ubuntu            \
-    DOCKERFILE_DISTRO=ubuntu          \
-    DOCKERFILE_DISTRO_VERSION=20.04   \
-    SPACK_ROOT=/opt/spack             \
-    DEBIAN_FRONTEND=noninteractive    \
-    CURRENTLY_BUILDING_DOCKER_IMAGE=1 \
-    container=docker
-
-## 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 v`spack --version` && cd - \
- && 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 \
- && spack env activate . \
- && spack install -j32 \
- && spack clean -a
-
-## Install additional python packages
-RUN cd /opt/spack-environment && spack env activate . \
- && pip install --trusted-host pypi.org \
-                --trusted-host files.pythonhosted.org \
-                --no-cache-dir \
-        ipython matplotlib scipy
-
-## Build elements prone to change here, to allow us to rebuild
-## from runner cache efficiently
-RUN cd /opt/spack-environment \
- && spack env activate . \
- && spack add npdet@master \
- && spack install \
- && spack clean -a
-
-## Strip the binaries
-#RUN find -L /usr/local/* -type f -exec readlink -f '{}' \; | \
-#    xargs file -i | \
-#    grep 'charset=binary' | \
-#    grep 'x-executable\|x-archive\|x-sharedlib' | \
-#    awk -F: '{print $1}' | xargs strip -s
-
-# Modifications to the environment that are necessary to run
-# Also make sure we keep the /lib/x86_65-linux-gnu in our PATH
-RUN cd /opt/spack-environment \
- && spack env activate --sh -d . > /etc/profile.d/z10_spack_environment.sh \
- && sed -i "s?LD_LIBRARY_PATH=?&/lib/x86_64-linux-gnu:?" /etc/profile.d/z10_spack_environment.sh
-
-# Somehow PODIO env isn't automatically set, 
-# and Gaudi likes BINARY_TAG to be set
-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-gcc9-opt" >> /etc/profile.d/z10_spack_environment.sh
-
-## make sure we have the entrypoints setup correctly
-ENTRYPOINT []
-CMD ["bash", "--rcfile", "/etc/profile", "-l"]
-USER 0
-WORKDIR /