From 661fd7bb677ee8977be84a2f39e7089c925f2981 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 17 Dec 2021 10:19:21 +0100 Subject: 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 --- share/spack/docker/amazonlinux-2.dockerfile | 1 - share/spack/docker/ubuntu-1604.dockerfile | 1 - share/spack/docker/ubuntu-1804.dockerfile | 1 - 3 files changed, 3 deletions(-) (limited to 'share') 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"] -- cgit v1.2.3-70-g09d2