From f710be663eef646957b146de2cdd498f5d3be742 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Fri, 4 Aug 2023 07:10:35 +0900 Subject: [PATCH] Jenkinsfile: add Rocky Linux and AlmaLinux CentOS Stream 8 will reach its EOL within less than a year ahead of Rocky and Alma: - CentOS Stream 8: 2024-05-31 - Rocky Linux 8: 2029-05-31 - AlmaLinux 8: 2029 So RPMs for Rocky and Alma have to be built without depending on CentOS Stream. Part of docker/docker-ce-packaging issue 933 Signed-off-by: Akihiro Suda --- Jenkinsfile | 8 ++++++-- dockerfiles/rpm.dockerfile | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 600707e4..f0440647 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,8 +8,12 @@ def images = [ [image: "docker.io/library/amazonlinux:2", arches: ["aarch64"]], [image: "docker.io/library/centos:7", arches: ["amd64", "aarch64"]], - [image: "quay.io/centos/centos:stream8", arches: ["amd64", "aarch64"]], - [image: "quay.io/centos/centos:stream9", arches: ["amd64", "aarch64"]], + [image: "quay.io/centos/centos:stream8", arches: ["amd64", "aarch64"]], // EOL: 2024-05-31 + [image: "quay.io/centos/centos:stream9", arches: ["amd64", "aarch64"]], // EOL: 2027 + [image: "docker.io/library/rockylinux:8", arches: ["amd64", "aarch64"]], // Rocky Linux 8 (EOL: 2029-05-31) + [image: "docker.io/library/rockylinux:9", arches: ["amd64", "aarch64"]], // Rocky Linux 9 (EOL: 2032-05-31) + [image: "docker.io/library/almalinux:8", arches: ["amd64", "aarch64"]], // AlmaLinux 8 (EOL: 2029) + [image: "docker.io/library/almalinux:9", arches: ["amd64", "aarch64"]], // AlmaLinux 9 (EOL: 2032) [image: "docker.io/library/debian:buster", arches: ["amd64", "aarch64", "armhf"]], // Debian 10 (EOL: 2024) [image: "docker.io/library/debian:bullseye", arches: ["amd64", "aarch64", "armhf"]], // Debian 11 (stable) [image: "docker.io/library/debian:bookworm", arches: ["amd64", "aarch64", "armhf"]], // Debian 12 (next stable) diff --git a/dockerfiles/rpm.dockerfile b/dockerfiles/rpm.dockerfile index 41fecda3..35c2e50e 100644 --- a/dockerfiles/rpm.dockerfile +++ b/dockerfiles/rpm.dockerfile @@ -47,6 +47,10 @@ FROM redhat-base AS ol-base RUN . "/etc/os-release"; if [ "${VERSION_ID%.*}" -eq 7 ]; then yum-config-manager --enable ol7_addons --enable ol7_optional_latest; fi RUN . "/etc/os-release"; if [ "${VERSION_ID%.*}" -eq 8 ]; then yum-config-manager --enable ol8_addons; fi +FROM redhat-base AS rocky-base + +FROM redhat-base AS almalinux-base + FROM ${BUILD_IMAGE} AS fedora-base RUN dnf install -y rpm-build git dnf-plugins-core