Now also dynamically configure singularity definition for consistency

.gitlab-ci.yml

@@ -21,10 +21,8 @@ default:
     - |
       if [ -f .ci-env/release ]; then 
         export BRANCH='release'
-        export SINGULARITY_DEF='eic-latest.def'
       elif [ -f .ci-env/develop ]; then
         export BRANCH='develop'
-        export SINGULARITY_DEF='eic-unstable.def'
       else export BRANCH='UNKNOWN'
       fi
     - |
@@ -91,6 +89,7 @@ builder:
     - cd containers/builder
     - head Dockerfile
     - make login
+    - echo "Creating builder image for ${BUILDER_TARGET}"
     - make ${BUILDER_TARGET}
 
 config:stable:
@@ -142,7 +141,7 @@ release:singularity:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH != "develop"'
       when: manual
   script:
-     - cp containers/release/${SINGULARITY_DEF} eic.def
+     - cp config/eic.def eic.def
      - /bin/bash .gitlabci/setup.sh
      - /bin/bash .gitlabci/build.sh eic.def
      - mkdir -p build 

containers/release/configure_release.sh

@@ -24,3 +24,8 @@ grep export config/spack-env.sh | \
 sed '/^@ENV@/r config/eic-env.sh' containers/release/Dockerfile.in | \
   sed '/^@ENV@/d' | \
   sed "s/@TAG@/$TAG/" > config/Dockerfile
+
+## And release singularity definition
+sed '/^@ENV@/r config/eic-env.sh' containers/release/eic.def.in | \
+  sed '/^@ENV@/d' | \
+  sed "s/@TAG@/$TAG/" > config/eic.def

containers/release/eic-unstable.def

-Bootstrap: docker
-From: eicweb.phy.anl.gov:4567/containers/eic_container/eic:unstable
-
-%help
-  EIC software container.
-  Tools:
-     - eic_shell   : Bash shell in this container
-     - root        : Root shell in the container
-     - ipython     : Python shell in the container
-
-%labels
-  Maintainer "Whitney Armstrong, Sylvester Joosten"
-  Version v2.x
-
-%post -c /bin/bash
-  echo "  -------------------------------------------------"
-  echo "  ===> Image setup complete"
-  echo "  -------------------------------------------------"

containers/release/eic-latest.def → containers/release/eic.def.in

 Bootstrap: docker
-From: eicweb.phy.anl.gov:4567/containers/eic_container/eic:latest
+From: eicweb.phy.anl.gov:4567/containers/eic_container/eic:@TAG@
 
 %help
   EIC software container.