From eff7fdd81bed6761a29f85b7dfa39f07d3015ea4 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 30 Dec 2022 14:11:05 +0100 Subject: [PATCH] Use Rocky Linux for RHEL builds CentOS Stream isn't fully compatible with RHEL, and there are no useful RHEL images available, so that leaves us with one of the new RHEL forks. --- .github/containers/{centos8 => rocky8}/Dockerfile | 2 +- .github/containers/{centos8 => rocky8}/build.sh | 0 .github/containers/{centos9 => rocky9}/Dockerfile | 2 +- .github/containers/{centos9 => rocky9}/build.sh | 0 .github/workflows/build.yml | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename .github/containers/{centos8 => rocky8}/Dockerfile (91%) rename .github/containers/{centos8 => rocky8}/build.sh (100%) rename .github/containers/{centos9 => rocky9}/Dockerfile (87%) rename .github/containers/{centos9 => rocky9}/build.sh (100%) diff --git a/.github/containers/centos8/Dockerfile b/.github/containers/rocky8/Dockerfile similarity index 91% rename from .github/containers/centos8/Dockerfile rename to .github/containers/rocky8/Dockerfile index 2e2ae6fc..d6f57967 100644 --- a/.github/containers/centos8/Dockerfile +++ b/.github/containers/rocky8/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/centos/centos:stream8 +FROM rockylinux:8 RUN dnf -y group install 'Development Tools' RUN dnf -y install sudo diff --git a/.github/containers/centos8/build.sh b/.github/containers/rocky8/build.sh similarity index 100% rename from .github/containers/centos8/build.sh rename to .github/containers/rocky8/build.sh diff --git a/.github/containers/centos9/Dockerfile b/.github/containers/rocky9/Dockerfile similarity index 87% rename from .github/containers/centos9/Dockerfile rename to .github/containers/rocky9/Dockerfile index 168dfe45..1b254a9d 100644 --- a/.github/containers/centos9/Dockerfile +++ b/.github/containers/rocky9/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/centos/centos:stream9 +FROM rockylinux:9 RUN dnf -y group install 'Development Tools' RUN dnf -y install sudo diff --git a/.github/containers/centos9/build.sh b/.github/containers/rocky9/build.sh similarity index 100% rename from .github/containers/centos9/build.sh rename to .github/containers/rocky9/build.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3caa0342..68ecaaa9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -107,8 +107,8 @@ jobs: matrix: target: - centos7 - - centos8 - - centos9 + - rocky8 + - rocky9 - bionic - focal - jammy -- 2.39.5