diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 985456f..fdeac2f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,7 @@ jobs: e2e: strategy: matrix: - distro: [centos8, centos9, fedora41] + distro: [rocky8, rocky9, fedora41] runs-on: ubuntu-latest steps: diff --git a/Dockerfile b/Dockerfile index 1223750..16c42c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,16 +4,7 @@ ARG POLICY # to build the SELinux policies and package them as RPM for each # of the target platforms. -FROM quay.io/centos/centos:stream8 AS centos8 - -# Stream8 is now EOL and the DNS it relied on for mirror lists -# (mirrorlist.centos.org), no longer resolves. -# The adhoc solution is to disable the use of the mirrorlist and default -# to vault.centos.org instead. -# -# https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/ -RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* +FROM rockylinux:8 AS rocky8 RUN yum install -y \ createrepo_c \ @@ -24,7 +15,7 @@ RUN yum install -y \ rpm-build \ rpm-sign -FROM quay.io/centos/centos:stream9 AS centos9 +FROM rockylinux:9 AS rocky9 RUN yum install -y \ createrepo_c \ epel-release \ diff --git a/hack/e2e/centos8.yaml b/hack/e2e/rocky8.yaml similarity index 100% rename from hack/e2e/centos8.yaml rename to hack/e2e/rocky8.yaml diff --git a/hack/e2e/centos9.yaml b/hack/e2e/rocky9.yaml similarity index 100% rename from hack/e2e/centos9.yaml rename to hack/e2e/rocky9.yaml diff --git a/hack/upload b/hack/upload index 8bdd9cb..1cac524 100755 --- a/hack/upload +++ b/hack/upload @@ -52,11 +52,11 @@ function aws_auth() function upload_artefacts() { case "${POLICY}" in - "centos8") - S3_POLICY_DIR="centos/8" + "rocky8") + S3_POLICY_DIR="rocky/8" ;; - "centos9") - S3_POLICY_DIR="centos/9" + "rocky9") + S3_POLICY_DIR="rocky/9" ;; "fedora41") S3_POLICY_DIR="fedora/41" diff --git a/policy/centos8/rancher-selinux.spec b/policy/rocky8/rancher-selinux.spec similarity index 100% rename from policy/centos8/rancher-selinux.spec rename to policy/rocky8/rancher-selinux.spec diff --git a/policy/centos8/rancher.fc b/policy/rocky8/rancher.fc similarity index 100% rename from policy/centos8/rancher.fc rename to policy/rocky8/rancher.fc diff --git a/policy/centos8/rancher.te b/policy/rocky8/rancher.te similarity index 100% rename from policy/centos8/rancher.te rename to policy/rocky8/rancher.te diff --git a/policy/centos9/rancher-selinux.spec b/policy/rocky9/rancher-selinux.spec similarity index 100% rename from policy/centos9/rancher-selinux.spec rename to policy/rocky9/rancher-selinux.spec diff --git a/policy/centos9/rancher.fc b/policy/rocky9/rancher.fc similarity index 100% rename from policy/centos9/rancher.fc rename to policy/rocky9/rancher.fc diff --git a/policy/centos9/rancher.te b/policy/rocky9/rancher.te similarity index 100% rename from policy/centos9/rancher.te rename to policy/rocky9/rancher.te