diff options
| author | Wouter Deconinck <wdconinc@gmail.com> | 2024-06-27 03:38:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-27 10:38:56 +0200 |
| commit | f916b50491603c7f17a984d685d9bc73760c9952 (patch) | |
| tree | 03264a702962b7bb8df199336cb9c05407f29db5 /share | |
| parent | 7160e1d3e7ef33f70e58ff84acd8ef58d79f73a5 (diff) | |
| download | spack-f916b50491603c7f17a984d685d9bc73760c9952.tar.gz spack-f916b50491603c7f17a984d685d9bc73760c9952.tar.bz2 spack-f916b50491603c7f17a984d685d9bc73760c9952.tar.xz spack-f916b50491603c7f17a984d685d9bc73760c9952.zip | |
containers: centos:stream -> centos:stream9 (#44876)
Diffstat (limited to 'share')
| -rw-r--r-- | share/spack/templates/container/Dockerfile | 2 | ||||
| -rw-r--r-- | share/spack/templates/container/bootstrap-base.dockerfile | 2 | ||||
| -rw-r--r-- | share/spack/templates/container/centos_stream9.dockerfile (renamed from share/spack/templates/container/centos_stream.dockerfile) | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/share/spack/templates/container/Dockerfile b/share/spack/templates/container/Dockerfile index 2f7aae901c..35dc270a22 100644 --- a/share/spack/templates/container/Dockerfile +++ b/share/spack/templates/container/Dockerfile @@ -4,7 +4,7 @@ {% endif %} {% if render_phase.build %} # Build stage with Spack pre-installed and ready to be used -FROM {{ build.image }} as builder +FROM {{ build.image }} AS builder {% block build_stage %} {% if os_packages_build %} diff --git a/share/spack/templates/container/bootstrap-base.dockerfile b/share/spack/templates/container/bootstrap-base.dockerfile index 38de6c8849..a8310a982a 100644 --- a/share/spack/templates/container/bootstrap-base.dockerfile +++ b/share/spack/templates/container/bootstrap-base.dockerfile @@ -1,4 +1,4 @@ -FROM {{ bootstrap.image }} as bootstrap +FROM {{ bootstrap.image }} AS bootstrap {% block env_vars %} ENV SPACK_ROOT=/opt/spack \ diff --git a/share/spack/templates/container/centos_stream.dockerfile b/share/spack/templates/container/centos_stream9.dockerfile index c11a658fc7..e62c64364f 100644 --- a/share/spack/templates/container/centos_stream.dockerfile +++ b/share/spack/templates/container/centos_stream9.dockerfile @@ -1,14 +1,14 @@ {% extends "container/bootstrap-base.dockerfile" %} {% block install_os_packages %} RUN dnf update -y \ - # See https://fedoraproject.org/wiki/EPEL#Quickstart for powertools + # See https://fedoraproject.org/wiki/EPEL#Quickstart for crb && dnf install -y dnf-plugins-core \ - && dnf config-manager --set-enabled powertools \ + && dnf config-manager --set-enabled crb \ && dnf install -y epel-release \ && dnf update -y \ && dnf --enablerepo epel groupinstall -y "Development Tools" \ && dnf --enablerepo epel install -y \ - curl \ + curl-minimal \ findutils \ gcc-c++ \ gcc \ |