Merge branch 'staging' into 'master'

Merge in new feature version

See merge request !9

.gitlab-ci.yml

@@ -31,7 +31,7 @@ builder_unstable:
      - cd containers/builder
      - head Dockerfile
      - make login
-     - make develop-cached
+     - make develop
 
 ## I wish there were a simple way to transfer the "latest/unstable" strings
 ## between jobs...

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.2`.
+   release version is `v2.1.3`.
 ```bash
-./deploy.py -v 2.1.2 <PREFIX>
+./deploy.py -v 2.1.3 <PREFIX>
 ```
 
    Available flags:
@@ -117,8 +117,8 @@ Included software:
     - podio@master
     - geant4@10.6.2
     - dd4hep@1.13.1
-    - acts@0.30.0
-    - gaudi@33.2
+    - acts@0.31.0
+    - gaudi@34.0
   - The singularity build exports the following applications:
     - eic_shell: a development shell in the image
     - container_dev: same as EIC shell

VERSION

-2.1.2
+2.1.3

containers/builder/Dockerfile

@@ -19,6 +19,7 @@ ENV DOCKERFILE_BASE=ubuntu            \
 
 ## Ensure an up-to-date custom package list
 RUN rm -rf $SPACK_ROOT/np-spack \
+ && echo "Update spack for v2.1.3" \
  && 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 \

containers/builder/Makefile

@@ -83,7 +83,7 @@ release: build-nc publish ## Make a release by building and publishing the `{ver
 
 develop: build-nc publish-dev ## Develop build, do not publish latest
 	@echo "Cleaning up"
-	docker rmi $(APP_NAME):unstable
+	#docker rmi $(APP_NAME):latest
 
 release-cached: build publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR
 develop-cached: build login publish-dev ## develop release

containers/builder/spack.yaml

@@ -19,8 +19,8 @@ spack:
     - podio@master
     - geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
     - dd4hep@1.13.1 +geant4 +assimp +hepmc3
-    - acts@0.30.0 +dd4hep +digitization +identification +json +tgeo
-    - gaudi@33.2
+    - acts@0.31.0 +dd4hep +digitization +identification +json +tgeo
+    - gaudi@34.0
   concretization: together
   config:
     install_tree: /opt/software

containers/release/Makefile

@@ -79,11 +79,11 @@ login: ## Auto login to AWS-ECR unsing aws-cli
 
 release: build-nc publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR
 	@echo "Cleaning up"
-	docker rmi $(APP_NAME):latest
+	#docker rmi $(APP_NAME):latest
 
 develop: build-nc publish-dev ## Develop build, do not publish latest
 	@echo "Cleaning up"
-	docker rmi $(APP_NAME):unstable
+	#docker rmi $(APP_NAME):latest
 
 release-cached: build publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR
 develop-cached: build login publish-dev ## develop release