diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2022-10-25 13:46:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-25 11:46:47 +0000 |
| commit | 00ae74f40e4ac918f4826bf3fb61da6f28af5051 (patch) | |
| tree | 81091fe67782ad50d66fbe4f11c28326bd55a42b | |
| parent | 62526c10853087b279d0ba4f0a01fe64b2c92d66 (diff) | |
| download | spack-00ae74f40e4ac918f4826bf3fb61da6f28af5051.tar.gz spack-00ae74f40e4ac918f4826bf3fb61da6f28af5051.tar.bz2 spack-00ae74f40e4ac918f4826bf3fb61da6f28af5051.tar.xz spack-00ae74f40e4ac918f4826bf3fb61da6f28af5051.zip | |
Update Spack Dockerfiles (#33500)
* Use spack bootstrap now in containers
* Fix wrong path glob expression
| -rw-r--r-- | .github/workflows/build-containers.yml | 2 | ||||
| -rw-r--r-- | share/spack/templates/container/bootstrap-base.dockerfile | 2 | ||||
| -rw-r--r-- | share/spack/templates/container/leap-15.dockerfile | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 940e9d965f..83647e4ad1 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -13,7 +13,7 @@ on: paths: - '.github/workflows/build-containers.yml' - 'share/spack/docker/*' - - 'share/templates/container/*' + - 'share/spack/templates/container/*' - 'lib/spack/spack/container/*' # Let's also build & tag Spack containers on releases. release: diff --git a/share/spack/templates/container/bootstrap-base.dockerfile b/share/spack/templates/container/bootstrap-base.dockerfile index 0674ddd541..e002cce02e 100644 --- a/share/spack/templates/container/bootstrap-base.dockerfile +++ b/share/spack/templates/container/bootstrap-base.dockerfile @@ -39,7 +39,7 @@ WORKDIR /root SHELL ["docker-shell"] # Creates the package cache -RUN spack spec hdf5+mpi +RUN spack bootstrap now && spack spec hdf5+mpi ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"] CMD ["interactive-shell"] diff --git a/share/spack/templates/container/leap-15.dockerfile b/share/spack/templates/container/leap-15.dockerfile index 38e4f1c009..2427c37754 100644 --- a/share/spack/templates/container/leap-15.dockerfile +++ b/share/spack/templates/container/leap-15.dockerfile @@ -12,7 +12,6 @@ RUN zypper ref && \ git\ gzip\ patch\ - patchelf\ python3-base \ python3-boto3\ tar\ |