Merge pull request #670 from lukemartinlogan/dev

Always run on worker dispatch
HDFGroup · Feb 8, 2024 · 8e09fc9 · 8e09fc9
2 parents 462b601 + 43be502
commit 8e09fc9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build_and_push_docker_images.yml b/.github/workflows/build_and_push_docker_images.yml
@@ -3,10 +3,10 @@ on:
   push:
   workflow_dispatch:
     inputs:
-      build_docker_images:
-        description: 'If ''true'', force a build of the docker images and push them to dockerhub'
-        required: false
-        default: false
+#      build_docker_images:
+#        description: 'If ''true'', force a build of the docker images and push them to dockerhub'
+#        required: false
+#        default: false
 jobs:
   build-docker-images:
     if: ${{ github.ref_type == 'tag' || github.event.inputs.build_docker_images }}

diff --git a/docker/deps.Dockerfile b/docker/deps.Dockerfile
@@ -50,6 +50,7 @@ RUN . /module_load.sh && \
 # Install hermes_shm
 RUN . /module_load.sh && \
     . "${SPACK_DIR}/share/spack/setup-env.sh" && \
+    spack external find && \
     spack install hermes_shm@master+vfd+mpiio^[email protected]
 
 # Install jarvis-cd

diff --git a/docker/user.Dockerfile b/docker/user.Dockerfile
@@ -50,6 +50,7 @@ RUN . /module_load.sh && \
 # Install hermes
 RUN . /module_load.sh && \
     . "${SPACK_DIR}/share/spack/setup-env.sh" && \
+    spack external find && \
     spack install hermes@master+vfd+mpiio^[email protected]
 
 # Install jarvis-cd