containers: centos:stream -> centos:stream9 (#44876)
This commit is contained in:
parent
7160e1d3e7
commit
f916b50491
2
.github/workflows/build-containers.yml
vendored
2
.github/workflows/build-containers.yml
vendored
@ -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'],
|
||||
|
@ -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``
|
||||
|
@ -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": {
|
||||
|
@ -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 %}
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM {{ bootstrap.image }} as bootstrap
|
||||
FROM {{ bootstrap.image }} AS bootstrap
|
||||
|
||||
{% block env_vars %}
|
||||
ENV SPACK_ROOT=/opt/spack \
|
||||
|
@ -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 \
|
Loading…
Reference in New Issue
Block a user