containers: centos:stream -> centos:stream9 (#44876)

This commit is contained in:
Wouter Deconinck 2024-06-27 03:38:56 -05:00 committed by GitHub
parent 7160e1d3e7
commit f916b50491
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 14 deletions

View File

@ -41,7 +41,7 @@ jobs:
# 2: Base image (e.g. ubuntu:22.04) # 2: Base image (e.g. ubuntu:22.04)
dockerfile: [[amazon-linux, 'linux/amd64,linux/arm64', 'amazonlinux:2'], dockerfile: [[amazon-linux, 'linux/amd64,linux/arm64', 'amazonlinux:2'],
[centos7, 'linux/amd64,linux/arm64,linux/ppc64le', 'centos:7'], [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'], [leap15, 'linux/amd64,linux/arm64,linux/ppc64le', 'opensuse/leap:15'],
[ubuntu-focal, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:20.04'], [ubuntu-focal, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:20.04'],
[ubuntu-jammy, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:22.04'], [ubuntu-jammy, 'linux/amd64,linux/arm64,linux/ppc64le', 'ubuntu:22.04'],

View File

@ -206,9 +206,9 @@ The OS that are currently supported are summarized in the table below:
* - CentOS 7 * - CentOS 7
- ``centos:7`` - ``centos:7``
- ``spack/centos7`` - ``spack/centos7``
* - CentOS Stream * - CentOS Stream9
- ``quay.io/centos/centos:stream`` - ``quay.io/centos/centos:stream9``
- ``spack/centos-stream`` - ``spack/centos-stream9``
* - openSUSE Leap * - openSUSE Leap
- ``opensuse/leap`` - ``opensuse/leap``
- ``spack/leap15`` - ``spack/leap15``

View File

@ -78,15 +78,15 @@
"image": "quay.io/almalinuxorg/almalinux:8" "image": "quay.io/almalinuxorg/almalinux:8"
} }
}, },
"centos:stream": { "centos:stream9": {
"bootstrap": { "bootstrap": {
"template": "container/centos_stream.dockerfile", "template": "container/centos_stream9.dockerfile",
"image": "quay.io/centos/centos:stream" "image": "quay.io/centos/centos:stream9"
}, },
"os_package_manager": "dnf_epel", "os_package_manager": "dnf_epel",
"build": "spack/centos-stream", "build": "spack/centos-stream9",
"final": { "final": {
"image": "quay.io/centos/centos:stream" "image": "quay.io/centos/centos:stream9"
} }
}, },
"centos:7": { "centos:7": {

View File

@ -4,7 +4,7 @@
{% endif %} {% endif %}
{% if render_phase.build %} {% if render_phase.build %}
# Build stage with Spack pre-installed and ready to be used # Build stage with Spack pre-installed and ready to be used
FROM {{ build.image }} as builder FROM {{ build.image }} AS builder
{% block build_stage %} {% block build_stage %}
{% if os_packages_build %} {% if os_packages_build %}

View File

@ -1,4 +1,4 @@
FROM {{ bootstrap.image }} as bootstrap FROM {{ bootstrap.image }} AS bootstrap
{% block env_vars %} {% block env_vars %}
ENV SPACK_ROOT=/opt/spack \ ENV SPACK_ROOT=/opt/spack \

View File

@ -1,14 +1,14 @@
{% extends "container/bootstrap-base.dockerfile" %} {% extends "container/bootstrap-base.dockerfile" %}
{% block install_os_packages %} {% block install_os_packages %}
RUN dnf update -y \ 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 install -y dnf-plugins-core \
&& dnf config-manager --set-enabled powertools \ && dnf config-manager --set-enabled crb \
&& dnf install -y epel-release \ && dnf install -y epel-release \
&& dnf update -y \ && dnf update -y \
&& dnf --enablerepo epel groupinstall -y "Development Tools" \ && dnf --enablerepo epel groupinstall -y "Development Tools" \
&& dnf --enablerepo epel install -y \ && dnf --enablerepo epel install -y \
curl \ curl-minimal \
findutils \ findutils \
gcc-c++ \ gcc-c++ \
gcc \ gcc \