From f916b50491603c7f17a984d685d9bc73760c9952 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 27 Jun 2024 03:38:56 -0500
Subject: containers: centos:stream -> centos:stream9 (#44876)

---
 share/spack/templates/container/Dockerfile         |  2 +-
 .../templates/container/bootstrap-base.dockerfile  |  2 +-
 .../templates/container/centos_stream.dockerfile   | 32 ----------------------
 .../templates/container/centos_stream9.dockerfile  | 32 ++++++++++++++++++++++
 4 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 share/spack/templates/container/centos_stream.dockerfile
 create mode 100644 share/spack/templates/container/centos_stream9.dockerfile

(limited to 'share')

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_stream.dockerfile
deleted file mode 100644
index c11a658fc7..0000000000
--- a/share/spack/templates/container/centos_stream.dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-{% extends "container/bootstrap-base.dockerfile" %}
-{% block install_os_packages %}
-RUN dnf update -y \
- # See https://fedoraproject.org/wiki/EPEL#Quickstart for powertools
- && dnf install -y dnf-plugins-core \
- && dnf config-manager --set-enabled powertools \
- && dnf install -y epel-release \
- && dnf update -y \
- && dnf --enablerepo epel groupinstall -y "Development Tools" \
- && dnf --enablerepo epel install -y \
-        curl \
-        findutils \
-        gcc-c++ \
-        gcc \
-        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 \
- && dnf clean all
-{% endblock %}
diff --git a/share/spack/templates/container/centos_stream9.dockerfile b/share/spack/templates/container/centos_stream9.dockerfile
new file mode 100644
index 0000000000..e62c64364f
--- /dev/null
+++ b/share/spack/templates/container/centos_stream9.dockerfile
@@ -0,0 +1,32 @@
+{% extends "container/bootstrap-base.dockerfile" %}
+{% block install_os_packages %}
+RUN dnf update -y \
+ # See https://fedoraproject.org/wiki/EPEL#Quickstart for crb
+ && dnf install -y dnf-plugins-core \
+ && 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-minimal \
+        findutils \
+        gcc-c++ \
+        gcc \
+        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 \
+ && dnf clean all
+{% endblock %}
-- 
cgit v1.2.3-70-g09d2