summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2021-12-17 10:19:21 +0100
committerGitHub <noreply@github.com>2021-12-17 09:19:21 +0000
commit661fd7bb677ee8977be84a2f39e7089c925f2981 (patch)
treef6e5ac2fc11076ed3d5bd448ea7ee69db875c0ec /share
parent18615b14852c70d404dfa6be78e6407d1d77e0c0 (diff)
downloadspack-661fd7bb677ee8977be84a2f39e7089c925f2981.tar.gz
spack-661fd7bb677ee8977be84a2f39e7089c925f2981.tar.bz2
spack-661fd7bb677ee8977be84a2f39e7089c925f2981.tar.xz
spack-661fd7bb677ee8977be84a2f39e7089c925f2981.zip
Fix building container images (#28063)
* 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
Diffstat (limited to 'share')
-rw-r--r--share/spack/docker/amazonlinux-2.dockerfile1
-rw-r--r--share/spack/docker/ubuntu-1604.dockerfile1
-rw-r--r--share/spack/docker/ubuntu-1804.dockerfile1
3 files changed, 0 insertions, 3 deletions
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"]