From 43be502743ba37dc79afffb7ff8f2a74508bd21b Mon Sep 17 00:00:00 2001 From: lukemartinlogan Date: Wed, 7 Feb 2024 23:29:57 -0600 Subject: [PATCH] Always run on worker dispatch --- .github/workflows/build_and_push_docker_images.yml | 8 ++++---- docker/deps.Dockerfile | 1 + docker/user.Dockerfile | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_push_docker_images.yml b/.github/workflows/build_and_push_docker_images.yml index e7d45a812..82738f63b 100644 --- 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 index 0ed7229a3..8fc4d068e 100644 --- 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^mpich@3.3.2 # Install jarvis-cd diff --git a/docker/user.Dockerfile b/docker/user.Dockerfile index 8fc429ec5..c763456b2 100644 --- 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^mpich@3.3.2 # Install jarvis-cd