diff options
| author | Jonathon Anderson <17242663+blue42u@users.noreply.github.com> | 2023-08-09 02:46:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-09 09:46:59 +0200 |
| commit | 9aa3b4619b867e195ba74b0da6ed1db0039c331d (patch) | |
| tree | aec2c4750b4c47dfd2e1cb32ebc39a837dad0999 /share | |
| parent | 3d733da70a0b7d2749378eecf8ff882bd9b9f8e3 (diff) | |
| download | spack-9aa3b4619b867e195ba74b0da6ed1db0039c331d.tar.gz spack-9aa3b4619b867e195ba74b0da6ed1db0039c331d.tar.bz2 spack-9aa3b4619b867e195ba74b0da6ed1db0039c331d.tar.xz spack-9aa3b4619b867e195ba74b0da6ed1db0039c331d.zip | |
containerize: ensure bootstrap images contain all system dependencies (#36818)
This also makes `spack bootstrap status` exit 1 if some dependency is missing
Diffstat (limited to 'share')
6 files changed, 17 insertions, 1 deletions
diff --git a/share/spack/templates/container/amazonlinux_2.dockerfile b/share/spack/templates/container/amazonlinux_2.dockerfile index c5b69e317d..e11dd0c482 100644 --- a/share/spack/templates/container/amazonlinux_2.dockerfile +++ b/share/spack/templates/container/amazonlinux_2.dockerfile @@ -10,6 +10,7 @@ RUN yum update -y \ gcc-gfortran \ git \ gnupg2 \ + hg \ hostname \ iproute \ make \ @@ -18,6 +19,7 @@ RUN yum update -y \ python3-pip \ python3-setuptools \ unzip \ + zstd \ && pip3 install boto3 \ && rm -rf /var/cache/yum \ && yum clean all diff --git a/share/spack/templates/container/bootstrap-base.dockerfile b/share/spack/templates/container/bootstrap-base.dockerfile index ac069bbe37..38de6c8849 100644 --- a/share/spack/templates/container/bootstrap-base.dockerfile +++ b/share/spack/templates/container/bootstrap-base.dockerfile @@ -39,7 +39,9 @@ WORKDIR /root SHELL ["docker-shell"] # Creates the package cache -RUN spack bootstrap now && spack spec hdf5+mpi +RUN spack bootstrap now \ + && spack bootstrap status --optional \ + && spack spec hdf5+mpi ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"] CMD ["interactive-shell"] diff --git a/share/spack/templates/container/centos_7.dockerfile b/share/spack/templates/container/centos_7.dockerfile index d4401c5413..2d99ecad91 100644 --- a/share/spack/templates/container/centos_7.dockerfile +++ b/share/spack/templates/container/centos_7.dockerfile @@ -13,6 +13,7 @@ RUN yum update -y \ git \ gnupg2 \ hostname \ + hg \ iproute \ make \ patch \ @@ -20,6 +21,7 @@ RUN yum update -y \ python3-pip \ python3-setuptools \ unzip \ + zstd \ && pip3 install boto3 \ && rm -rf /var/cache/yum \ && yum clean all diff --git a/share/spack/templates/container/centos_stream.dockerfile b/share/spack/templates/container/centos_stream.dockerfile index 427b242b8d..c11a658fc7 100644 --- a/share/spack/templates/container/centos_stream.dockerfile +++ b/share/spack/templates/container/centos_stream.dockerfile @@ -15,13 +15,16 @@ RUN dnf update -y \ gcc-gfortran \ git \ gnupg2 \ + hg \ hostname \ iproute \ make \ + svn \ patch \ python3.11 \ python3.11-setuptools \ unzip \ + zstd \ && python3.11 -m ensurepip \ && pip3.11 install boto3 \ && rm -rf /var/cache/dnf \ diff --git a/share/spack/templates/container/leap-15.dockerfile b/share/spack/templates/container/leap-15.dockerfile index 2427c37754..386f0b5b2f 100644 --- a/share/spack/templates/container/leap-15.dockerfile +++ b/share/spack/templates/container/leap-15.dockerfile @@ -9,12 +9,16 @@ RUN zypper ref && \ gcc-c++\ gcc-fortran\ make\ + mercurial\ git\ gzip\ patch\ python3-base \ python3-boto3\ + subversion\ tar\ + unzip\ xz\ + zstd\ && zypper clean {% endblock %} diff --git a/share/spack/templates/container/ubuntu_2004.dockerfile b/share/spack/templates/container/ubuntu_2004.dockerfile index 26b6562952..f1c3ca456d 100644 --- a/share/spack/templates/container/ubuntu_2004.dockerfile +++ b/share/spack/templates/container/ubuntu_2004.dockerfile @@ -22,10 +22,13 @@ RUN apt-get -yqq update \ iproute2 \ locales \ make \ + mercurial \ + subversion \ python3 \ python3-pip \ python3-setuptools \ unzip \ + zstd \ && locale-gen en_US.UTF-8 \ && pip3 install boto3 \ && rm -rf /var/lib/apt/lists/* |