zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building container images (#28063)

Browse Source 
* Fix building container images

Patchelf is bootstrapped from sources, so we cannot
disable that mechanism until a finer selection is
possible in the configuration.

* Build on changes to the Dockerfile

* Don't login to Dockerhub on PRs
This commit is contained in:
Massimiliano Culpo 2021-12-17 10:19:21 +01:00 committed by GitHub
parent 18615b1485
commit 661fd7bb67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-containers.yml vendored
View File

@ -12,6 +12,7 @@ on:
- develop - develop
paths: paths:
- '.github/workflows/build-containers.yml' - '.github/workflows/build-containers.yml'
- 'share/spack/docker/*'
# Let's also build & tag Spack containers on releases. # Let's also build & tag Spack containers on releases.
release: release:
types: [published] types: [published]
@ -73,6 +74,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- name: Log in to DockerHub - name: Log in to DockerHub
if: ${{ github.event_name != 'pull_request' }}
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 # @v1 uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 # @v1
with: with:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}

1
share/spack/docker/amazonlinux-2.dockerfile
View File

@ -63,7 +63,6 @@ WORKDIR /root
SHELL ["docker-shell"] SHELL ["docker-shell"]
# TODO: add a command to Spack that (re)creates the package cache # TODO: add a command to Spack that (re)creates the package cache
RUN spack bootstrap untrust spack-install
RUN spack spec hdf5+mpi RUN spack spec hdf5+mpi
ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"] ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]

1
share/spack/docker/ubuntu-1604.dockerfile
View File

@ -67,7 +67,6 @@ WORKDIR /root
SHELL ["docker-shell"] SHELL ["docker-shell"]
# TODO: add a command to Spack that (re)creates the package cache # TODO: add a command to Spack that (re)creates the package cache
RUN spack bootstrap untrust spack-install
RUN spack spec hdf5+mpi RUN spack spec hdf5+mpi
ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"] ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]

1
share/spack/docker/ubuntu-1804.dockerfile
View File

@ -67,7 +67,6 @@ WORKDIR /root
SHELL ["docker-shell"] SHELL ["docker-shell"]
# TODO: add a command to Spack that (re)creates the package cache # TODO: add a command to Spack that (re)creates the package cache
RUN spack bootstrap untrust spack-install
RUN spack spec hdf5+mpi RUN spack spec hdf5+mpi
ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"] ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]