From f916b50491603c7f17a984d685d9bc73760c9952 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Thu, 27 Jun 2024 03:38:56 -0500 Subject: containers: centos:stream -> centos:stream9 (#44876) --- .github/workflows/build-containers.yml | 2 +- lib/spack/docs/containers.rst | 6 ++-- lib/spack/spack/container/images.json | 10 +++---- share/spack/templates/container/Dockerfile | 2 +- .../templates/container/bootstrap-base.dockerfile | 2 +- .../templates/container/centos_stream.dockerfile | 32 ---------------------- .../templates/container/centos_stream9.dockerfile | 32 ++++++++++++++++++++++ 7 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 share/spack/templates/container/centos_stream.dockerfile create mode 100644 share/spack/templates/container/centos_stream9.dockerfile diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 3d0ae85763..489d0356b0 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -41,7 +41,7 @@ jobs: # 2: Base image (e.g. ubuntu:22.04) dockerfile: [[amazon-linux, 'linux/amd64,linux/arm64', 'amazonlinux:2'], [centos7, 'linux/amd64,linux/arm64,linux/ppc64le', 'centos:7'], - [centos-stream, 'linux/amd64,linux/arm64,linux/ppc64le', 'centos:stream'], + [centos-stream9, 'linux/amd64,linux/arm64,linux/ppc64le', 'centos:stream9'], [leap15, 'linux/amd64,linux/arm64,linux/ppc64le', 'opensuse/leap:15'], [ubuntu-focal, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:20.04'], [ubuntu-jammy, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:22.04'], diff --git a/lib/spack/docs/containers.rst b/lib/spack/docs/containers.rst index 2f7b1ae9af..967afd0005 100644 --- a/lib/spack/docs/containers.rst +++ b/lib/spack/docs/containers.rst @@ -206,9 +206,9 @@ The OS that are currently supported are summarized in the table below: * - CentOS 7 - ``centos:7`` - ``spack/centos7`` - * - CentOS Stream - - ``quay.io/centos/centos:stream`` - - ``spack/centos-stream`` + * - CentOS Stream9 + - ``quay.io/centos/centos:stream9`` + - ``spack/centos-stream9`` * - openSUSE Leap - ``opensuse/leap`` - ``spack/leap15`` diff --git a/lib/spack/spack/container/images.json b/lib/spack/spack/container/images.json index 4283f3d2fb..6d3498919b 100644 --- a/lib/spack/spack/container/images.json +++ b/lib/spack/spack/container/images.json @@ -78,15 +78,15 @@ "image": "quay.io/almalinuxorg/almalinux:8" } }, - "centos:stream": { + "centos:stream9": { "bootstrap": { - "template": "container/centos_stream.dockerfile", - "image": "quay.io/centos/centos:stream" + "template": "container/centos_stream9.dockerfile", + "image": "quay.io/centos/centos:stream9" }, "os_package_manager": "dnf_epel", - "build": "spack/centos-stream", + "build": "spack/centos-stream9", "final": { - "image": "quay.io/centos/centos:stream" + "image": "quay.io/centos/centos:stream9" } }, "centos:7": { 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