diff options
| -rw-r--r-- | .github/workflows/build-containers.yml | 2 | ||||
| -rw-r--r-- | share/spack/docker/amazonlinux-2.dockerfile | 1 | ||||
| -rw-r--r-- | share/spack/docker/ubuntu-1604.dockerfile | 1 | ||||
| -rw-r--r-- | share/spack/docker/ubuntu-1804.dockerfile | 1 |
4 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index a55e0daa77..9f7841e548 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -12,6 +12,7 @@ on: - develop paths: - '.github/workflows/build-containers.yml' + - 'share/spack/docker/*' # Let's also build & tag Spack containers on releases. release: types: [published] @@ -73,6 +74,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Log in to DockerHub + if: ${{ github.event_name != 'pull_request' }} uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 # @v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/share/spack/docker/amazonlinux-2.dockerfile b/share/spack/docker/amazonlinux-2.dockerfile index d4066f76c4..93d67d9c4d 100644 --- a/share/spack/docker/amazonlinux-2.dockerfile +++ b/share/spack/docker/amazonlinux-2.dockerfile @@ -63,7 +63,6 @@ WORKDIR /root SHELL ["docker-shell"] # TODO: add a command to Spack that (re)creates the package cache -RUN spack bootstrap untrust spack-install RUN spack spec hdf5+mpi ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"] diff --git a/share/spack/docker/ubuntu-1604.dockerfile b/share/spack/docker/ubuntu-1604.dockerfile index dd7fcb1910..f5662408ee 100644 --- a/share/spack/docker/ubuntu-1604.dockerfile +++ b/share/spack/docker/ubuntu-1604.dockerfile @@ -67,7 +67,6 @@ WORKDIR /root SHELL ["docker-shell"] # TODO: add a command to Spack that (re)creates the package cache -RUN spack bootstrap untrust spack-install RUN spack spec hdf5+mpi ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"] diff --git a/share/spack/docker/ubuntu-1804.dockerfile b/share/spack/docker/ubuntu-1804.dockerfile index 280f0b9a7d..d491174e97 100644 --- a/share/spack/docker/ubuntu-1804.dockerfile +++ b/share/spack/docker/ubuntu-1804.dockerfile @@ -67,7 +67,6 @@ WORKDIR /root SHELL ["docker-shell"] # TODO: add a command to Spack that (re)creates the package cache -RUN spack bootstrap untrust spack-install RUN spack spec hdf5+mpi ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"] |