Merge pull request #413 from vvoland/more-distros

Add RHEL10 derivatives (Alma, Oracle, Rocky Linux)

Author: vvoland

docker-bake.hcl

@@ -27,18 +27,21 @@ variable "DISTROS" {
 
     "almalinux8",
     "almalinux9",
+    "almalinux10",
     "centos9",
     "centos10",
     "fedora42",
     "fedora43",
     "fedora44",
     "oraclelinux8",
     "oraclelinux9",
+    "oraclelinux10",
     "rhel8",
     "rhel9",
     "rhel10",
     "rockylinux8",
-    "rockylinux9"
+    "rockylinux9",
+    "rockylinux10"
   ]
 }
 
@@ -291,6 +294,18 @@ target "_distro-almalinux9" {
   }
 }
 
+target "_distro-almalinux10" {
+  args = {
+    DISTRO_NAME = "almalinux10"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "almalinux"
+    DISTRO_ID = "10"
+    DISTRO_SUITE = "10"
+    DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "almalinux:10"
+    TEST_ONLY = "1"
+  }
+}
+
 target "_distro-centos9" {
   args = {
     DISTRO_NAME = "centos9"
@@ -375,6 +390,18 @@ target "_distro-oraclelinux9" {
   }
 }
 
+target "_distro-oraclelinux10" {
+  args = {
+    DISTRO_NAME = "oraclelinux10"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "oraclelinux"
+    DISTRO_ID = "10"
+    DISTRO_SUITE = "10"
+    DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "oraclelinux:10"
+    TEST_ONLY = "1"
+  }
+}
+
 target "_distro-rhel8" {
   args = {
     DISTRO_NAME = "rhel8"
@@ -435,6 +462,18 @@ target "_distro-rockylinux9" {
   }
 }
 
+target "_distro-rockylinux10" {
+  args = {
+    DISTRO_NAME = "rockylinux10"
+    DISTRO_TYPE = "rpm"
+    DISTRO_RELEASE = "rockylinux"
+    DISTRO_ID = "10"
+    DISTRO_SUITE = "10"
+    DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "rockylinux/rockylinux:10"
+    TEST_ONLY = "1"
+  }
+}
+
 # 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,
@@ -457,18 +496,21 @@ function "distroPlatforms" {
 
         almalinux8 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         almalinux9 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
+        almalinux10 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         centos9 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
         centos10 = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
         fedora42 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         fedora43 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         fedora44 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         oraclelinux8 = ["linux/amd64", "linux/arm64"]
         oraclelinux9 = ["linux/amd64", "linux/arm64"]
+        oraclelinux10 = ["linux/amd64", "linux/arm64"]
         rhel8 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         rhel9 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         rhel10 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
         rockylinux8 = ["linux/amd64", "linux/arm64"]
         rockylinux9 = ["linux/amd64", "linux/arm64"]
+        rockylinux10 = ["linux/amd64", "linux/arm64"]
       }, distro, []),
       pkgPlatforms(pkg)
     ),

hack/scripts/rpm-init.sh

@@ -62,6 +62,11 @@ case "$pkgrelease" in
     dnf install -y git rpm-build rpmlint dnf-plugins-core oraclelinux-release-el9 oracle-epel-release-el9
     dnf config-manager --enable ol9_addons ol9_codeready_builder
     ;;
+  oraclelinux10)
+    dnf install -y dnf-plugins-core oraclelinux-release-el10 oracle-epel-release-el10
+    dnf config-manager --enable ol10_addons ol10_codeready_builder
+    dnf install -y git rpm-build rpmlint
+    ;;
   fedora*)
     dnf install -y git rpm-build rpmlint dnf-plugins-core
     ;;
@@ -70,8 +75,10 @@ case "$pkgrelease" in
     dnf config-manager --set-enabled powertools
     ;;
   rockylinux*|almalinux*)
-    dnf install -y git rpm-build rpmlint dnf-plugins-core epel-release
+    dnf install -y dnf-plugins-core epel-release
     dnf config-manager --set-enabled crb
+    # crb repo is needed for rpmlint
+    dnf install -y git rpm-build rpmlint
     ;;
   rhel*)
     # skipping rpmlint as it requires dependencies not available in ubi images

hack/scripts/verify-rpm-init.sh

@@ -47,6 +47,11 @@ case "$pkgrelease" in
     dnf install -y findutils dnf-plugins-core oraclelinux-release-el9 oracle-epel-release-el9
     dnf config-manager --enable ol9_addons ol9_codeready_builder
     ;;
+  oraclelinux10)
+    dnf install -y dnf-plugins-core oraclelinux-release-el10 oracle-epel-release-el10
+    dnf config-manager --enable ol10_addons ol10_codeready_builder
+    dnf install -y findutils
+    ;;
   fedora*|rhel*)
     dnf install -y findutils dnf-plugins-core
     ;;