Merge pull request #138 from crazy-max/rockylinux

rpm: add rockylinux and almalinux

Author: crazy-max

Makefile

@@ -13,10 +13,25 @@
 # limitations under the License.
 
 # Same as ones in docker-bake.hcl
-DISTROS_DEB ?= debian11 debian12 debian13 ubuntu2204 ubuntu2404 raspbian11 raspbian12
-DISTROS_RPM ?= centos9 fedora41 fedora42 oraclelinux8 oraclelinux9
-DISTROS_STATIC ?= static
-DISTROS ?= $(DISTROS_DEB) $(DISTROS_RPM) $(DISTROS_STATIC)
+DISTROS ?= static \
+	\
+	debian11 \
+	debian12 \
+	debian13 \
+	raspbian11 \
+	raspbian12 \
+	ubuntu2204 \
+	ubuntu2404 \
+	\
+	almalinux8 \
+	almalinux9 \
+	centos9 \
+	fedora41 \
+	fedora42 \
+	oraclelinux8 \
+	oraclelinux9 \
+	rockylinux8 \
+	rockylinux9
 
 # Should match ones from docker-bake.hcl
 PKGS_RAW := $(notdir $(shell find "pkg/" -maxdepth 1 -type d))

docker-bake.hcl

@@ -16,18 +16,24 @@ variable "DISTROS" {
   description = "List of supported distros. Don't forget to update _distro-* target if you add/remove a distro."
   default = [
     "static",
+
     "debian11",
     "debian12",
     "debian13",
     "raspbian11",
     "raspbian12",
     "ubuntu2204",
     "ubuntu2404",
+
+    "almalinux8",
+    "almalinux9",
     "centos9",
     "fedora41",
     "fedora42",
     "oraclelinux8",
-    "oraclelinux9"
+    "oraclelinux9",
+    "rockylinux8",
+    "rockylinux9"
   ]
 }
 
@@ -243,6 +249,28 @@ target "_distro-ubuntu2404" {
   }
 }
 
+target "_distro-almalinux8" {
+  args = {
+    DISTRO_NAME = "almalinux8"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "almalinux"
+    DISTRO_ID = "8"
+    DISTRO_SUITE = "8"
+    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "almalinux:8"
+  }
+}
+
+target "_distro-almalinux9" {
+  args = {
+    DISTRO_NAME = "almalinux9"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "almalinux"
+    DISTRO_ID = "9"
+    DISTRO_SUITE = "9"
+    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "almalinux:9"
+  }
+}
+
 target "_distro-centos9" {
   args = {
     DISTRO_NAME = "centos9"
@@ -298,6 +326,28 @@ target "_distro-oraclelinux9" {
   }
 }
 
+target "_distro-rockylinux8" {
+  args = {
+    DISTRO_NAME = "rockylinux8"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "rockylinux"
+    DISTRO_ID = "8"
+    DISTRO_SUITE = "8"
+    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "rockylinux/rockylinux:8"
+  }
+}
+
+target "_distro-rockylinux9" {
+  args = {
+    DISTRO_NAME = "rockylinux9"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "rockylinux"
+    DISTRO_ID = "9"
+    DISTRO_SUITE = "9"
+    DISTRO_IMAGE = DISTRO_IMAGE != null ? DISTRO_IMAGE : "rockylinux/rockylinux:9"
+  }
+}
+
 # Returns the list of supported platforms for a given distro and package.
 # The result is the intersection of the platforms supported by the distro
 # and the platforms supported by the package. Except for static distro,
@@ -309,18 +359,24 @@ function "distroPlatforms" {
     setintersection(
       lookup({
         static = pkgPlatforms(pkg)
+
         debian11 = ["linux/386", "linux/amd64", "linux/arm64", "linux/arm/v7", "linux/mips64le", "linux/ppc64le", "linux/s390x"]
         debian12 = ["linux/386", "linux/amd64", "linux/arm64", "linux/arm/v7", "linux/mips64le", "linux/ppc64le", "linux/s390x"]
         debian13 = ["linux/386", "linux/amd64", "linux/arm64", "linux/arm/v7", "linux/mips64le", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
         raspbian11 = ["linux/arm/v7"]
         raspbian12 = ["linux/arm/v7"]
         ubuntu2204 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/s390x"]
         ubuntu2404 = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le", "linux/riscv64", "linux/s390x"]
+
+        almalinux8 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
+        almalinux9 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         centos9 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
         fedora41 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         fedora42 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         oraclelinux8 = ["linux/amd64", "linux/arm64"]
         oraclelinux9 = ["linux/amd64", "linux/arm64"]
+        rockylinux8 = ["linux/amd64", "linux/arm64"]
+        rockylinux9 = ["linux/amd64", "linux/arm64"]
       }, distro, []),
       pkgPlatforms(pkg)
     ),

hack/scripts/rpm-init.sh

@@ -51,4 +51,12 @@ case "$pkgrelease" in
   fedora*)
     dnf install -y git rpm-build rpmlint dnf-plugins-core
     ;;
+  rockylinux8|almalinux8)
+    dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
+    dnf config-manager --set-enabled powertools
+    ;;
+  rockylinux*|almalinux*)
+    dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
+    dnf config-manager --set-enabled crb
+    ;;
 esac

hack/scripts/verify-rpm-init.sh

@@ -40,4 +40,12 @@ case "$pkgrelease" in
   fedora*)
     dnf install -y findutils dnf-plugins-core
     ;;
+  rockylinux8|almalinux8)
+    dnf install -y findutils dnf-plugins-core epel-release
+    dnf config-manager --set-enabled powertools
+    ;;
+  rockylinux*|almalinux*)
+    dnf install -y findutils dnf-plugins-core epel-release
+    dnf config-manager --set-enabled crb
+    ;;
 esac