rpm: add rockylinux 8 and 9

Signed-off-by: CrazyMax <[email protected]>
docker · Feb 6, 2024 · d70a116 · d70a116
1 parent 54ebfa2
commit d70a116
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ include common/packages.mk
 
 GHA_MATRIX ?= minimal
 ifeq ($(GHA_MATRIX),minimal)
-	GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2310 centos7 centos9 oraclelinux7 fedora39 static
+	GHA_RELEASES := debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2310 centos7 centos9 oraclelinux7 fedora39 rockylinux9 static
 else ifeq ($(GHA_MATRIX),all)
 	GHA_RELEASES := $(PKG_DEB_RELEASES) $(PKG_RPM_RELEASES) static
 else

diff --git a/common/packages.hcl b/common/packages.hcl
@@ -273,6 +273,28 @@ target "_pkg-oraclelinux9" {
   }
 }
 
+target "_pkg-rockylinux8" {
+  args = {
+    PKG_RELEASE = "rockylinux8"
+    PKG_TYPE = "rpm"
+    PKG_DISTRO = "rockylinux"
+    PKG_DISTRO_ID = "8"
+    PKG_DISTRO_SUITE = "8"
+    PKG_BASE_IMAGE = "rockylinux/rockylinux:8"
+  }
+}
+
+target "_pkg-rockylinux9" {
+  args = {
+    PKG_RELEASE = "rockylinux9"
+    PKG_TYPE = "rpm"
+    PKG_DISTRO = "rockylinux"
+    PKG_DISTRO_ID = "9"
+    PKG_DISTRO_SUITE = "9"
+    PKG_BASE_IMAGE = "rockylinux/rockylinux:9"
+  }
+}
+
 target "_pkg-static" {
   args = {
     PKG_RELEASE = ""

diff --git a/common/packages.mk b/common/packages.mk
@@ -16,7 +16,7 @@
 # if you add a new release
 PKG_APK_RELEASES ?= alpine314 alpine315 alpine316
 PKG_DEB_RELEASES ?= debian10 debian11 debian12 ubuntu2004 ubuntu2204 ubuntu2304 ubuntu2310 raspbian10 raspbian11 raspbian12
-PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora37 fedora38 fedora39 oraclelinux7 oraclelinux8 oraclelinux9
+PKG_RPM_RELEASES ?= centos7 centos8 centos9 fedora37 fedora38 fedora39 oraclelinux7 oraclelinux8 oraclelinux9 rockylinux8 rockylinux9
 
 # PKG_SUPPORTED_PLATFORMS could be replaced by:
 # docker buildx imagetools inspect centos:7 --format "{{json .Manifest}}" | jq -r '.manifests[] | "\(.platform.os)/\(.platform.architecture)/\(.platform.variant)"' | sed 's#/null$##' | tr '\n' ',' | sed 's#,$##'
@@ -241,6 +241,24 @@ pkg-info-oraclelinux9:
 	$(eval PKG_BASE_IMAGE = oraclelinux:9)
 	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64)
 
+.PHONY: pkg-info-rockylinux8
+pkg-info-rockylinux8:
+	$(eval PKG_TYPE = rpm)
+	$(eval PKG_DISTRO = rockylinux)
+	$(eval PKG_DISTRO_ID = 8)
+	$(eval PKG_DISTRO_SUITE = 8)
+	$(eval PKG_BASE_IMAGE = rockylinux/rockylinux:8)
+	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64)
+
+.PHONY: pkg-info-rockylinux9
+pkg-info-rockylinux9:
+	$(eval PKG_TYPE = rpm)
+	$(eval PKG_DISTRO = rockylinux)
+	$(eval PKG_DISTRO_ID = 9)
+	$(eval PKG_DISTRO_SUITE = 9)
+	$(eval PKG_BASE_IMAGE = rockylinux/rockylinux:9)
+	$(eval PKG_SUPPORTED_PLATFORMS = linux/amd64 linux/arm64)
+
 .PHONY: pkg-info-static
 pkg-info-static:
 	$(eval PKG_TYPE = static)

diff --git a/common/scripts/rpm-init.sh b/common/scripts/rpm-init.sh
@@ -83,4 +83,12 @@ case "$pkgrelease" in
   fedora*)
     dnf install -y git rpm-build rpmlint dnf-plugins-core
     ;;
+  rockylinux8)
+    dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
+    dnf config-manager --set-enabled devel
+    ;;
+  rockylinux*)
+    dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
+    dnf config-manager --set-enabled crb
+    ;;
 esac
diff --git a/common/scripts/verify-rpm-init.sh b/common/scripts/verify-rpm-init.sh
@@ -52,4 +52,12 @@ case "$pkgrelease" in
   fedora*)
     dnf install -y findutils dnf-plugins-core
     ;;
+  rockylinux8)
+    dnf install -y findutils dnf-plugins-core epel-release
+    dnf config-manager --set-enabled devel
+    ;;
+  rockylinux*)
+    dnf install -y findutils dnf-plugins-core epel-release
+    dnf config-manager --set-enabled crb
+    ;;
 esac
diff --git a/pkg/credential-helpers/verify.Dockerfile b/pkg/credential-helpers/verify.Dockerfile
@@ -70,7 +70,7 @@ RUN --mount=from=bin-folder,target=/build <<EOT
   extraflags=""
   case "$PKG_RELEASE" in
     # required pass package not available
-    centos7|oraclelinux9)
+    centos7|oraclelinux9|rockylinux8)
       extraflags="--skip-broken"
       ;;
     centos9)
@@ -89,7 +89,7 @@ RUN --mount=from=bin-folder,target=/build <<EOT
   docker-credential-secretservice version
   case "$PKG_RELEASE" in
     # FIXME: skip pass credential helper smoke test for some distros
-    centos7|centos9|oraclelinux9) ;;
+    centos7|centos9|oraclelinux9|rockylinux8) ;;
     *) docker-credential-pass version ;;
   esac
 EOT