docker: Update images to use environment modules

.github/workflows/everything.yml

@@ -227,9 +227,10 @@ jobs:
         - code: scorpio
           repo: E3SM-Project/scorpio
           ref: scorpio-v1.2.1
+
     defaults:
       run:
-        shell: bash -c "docker exec adios2-ci spack-named-env adios2 bash -e $(echo {0} | sed 's|/home/runner/work|/__w|g')"
+        shell: bash -c "docker exec adios2-ci bash --login -e $(echo {0} | sed 's|/home/runner/work|/__w|g')"
 
     steps:
     - uses: actions/checkout@v2

scripts/ci/images/spack/Dockerfile

@@ -12,18 +12,22 @@ RUN spack dev-build \
     spack clean -a
 
 # Build the environment
-RUN spack env create adios2 && \
+RUN spack env create --without-view adios2 && \
     spack -e adios2 add $(spack find --format "/{hash}") && \
     spack -e adios2 install -v && \
     rm -rf /root/.spack && \
     spack env activate adios2 && \
-    spack env deactivate
+    spack env deactivate && \
+    spack -e adios2 env loads
 
 # Initialize the first-use-of-environment stuff for the adios user
 WORKDIR /home/adios
 USER adios
 RUN spack env activate adios2 && \
-    spack env deactivate
+    spack env deactivate && \
+    echo "source /opt/spack/share/spack/setup-env.sh" >> ~/.bash_profile && \
+    echo "module use ${SPACK_ROOT}/share/spack/modules/linux-ubuntu18.04-haswell" >> ~/.bash_profile && \
+    echo "source ${SPACK_ROOT}/var/spack/environments/adios2/loads" >> ~/.bash_profile
 
-ENTRYPOINT ["/usr/local/bin/spack-named-env", "adios2"]
-CMD ["bash"]
+ENTRYPOINT []
+CMD ["bash", "--login"]

scripts/docker/Dockerfile.complete

@@ -7,19 +7,23 @@ RUN spack install \
         adios2 && \
     spack clean -a
 
-# Build the envirponment
-RUN spack env create adios2 && \
+# Build the environment
+RUN spack env create --without-view adios2 && \
     spack -e adios2 add $(spack find --format "/{hash}") && \
     spack -e adios2 install && \
     rm -rf /root/.spack && \
     spack env activate adios2 && \
-    spack env deactivate
+    spack env deactivate && \
+    spack -e adios2 env loads
 
 # Initialize the first-use-of-environment stuff for the adios user
 WORKDIR /home/adios
 USER adios
 RUN spack env activate adios2 && \
-    spack env deactivate
+    spack env deactivate && \
+    echo "source /opt/spack/share/spack/setup-env.sh" >> ~/.bash_profile && \
+    echo "module use ${SPACK_ROOT}/share/spack/modules/linux-ubuntu18.04-haswell" >> ~/.bash_profile && \
+    echo "source ${SPACK_ROOT}/var/spack/environments/adios2/loads" >> ~/.bash_profile
 
-ENTRYPOINT ["/usr/local/bin/spack-named-env", "adios2"]
-CMD ["bash"]
+ENTRYPOINT []
+CMD ["bash", "--login"]

scripts/docker/Dockerfile.dependencies

@@ -14,15 +14,12 @@ RUN cd ${SPACK_ROOT} && \
     git checkout -f develop && \
     rm -rf .git
 
-# Setup the modified entrypoint
+# Fix the python version being used
 ENV SPACK_PYTHON=/usr/bin/python3.6
-COPY entrypoint.bash $SPACK_ROOT/share/spack/docker/entrypoint.bash
-RUN rm -f /usr/local/bin/spack-named-env && \
-    ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash \
-          /usr/local/bin/spack-named-env
 
 # Setup the default configuration
 COPY packages.yaml $SPACK_ROOT/etc/spack/packages.yaml
+COPY modules.yaml $SPACK_ROOT/etc/spack/modules.yaml
 RUN rm -rf /root/.spack && \
     spack compiler find --scope site
 

scripts/docker/modules.yaml

@@ -0,0 +1,9 @@
+modules:
+  enable:
+  - tcl
+  tcl:
+    hash_length: 0
+    all:
+      autoload: 'direct'
+    projections:
+      all: '{name}/{version}'

testing/contract/scorpio/depends.sh

@@ -3,6 +3,4 @@
 set -x
 set -e
 
-sudo /opt/spack/bin/spack install parallel-netcdf
-sudo /opt/spack/bin/spack -e adios2 add parallel-netcdf
-sudo /opt/spack/bin/spack -e adios2 install -v
+sudo /opt/spack/bin/spack install -v parallel-netcdf

testing/contract/scorpio/setup.sh

@@ -7,3 +7,5 @@ echo "source_dir  = \"${source_dir}\""
 echo "build_dir   = \"${build_dir}\""
 echo "install_dir = \"${install_dir}\""
 echo "test_dir    = \"${test_dir}\""
+
+module load parallel-netcdf