From 6898b11674c80a4ec1165c91297471909f430dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 15 Apr 2026 13:02:51 +0200 Subject: [PATCH 1/5] Add Alma Linux 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- docker-bake.hcl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docker-bake.hcl b/docker-bake.hcl index e68b5b40..f60f54a9 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -27,6 +27,7 @@ variable "DISTROS" { "almalinux8", "almalinux9", + "almalinux10", "centos9", "centos10", "fedora42", @@ -291,6 +292,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" @@ -457,6 +470,7 @@ 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"] From cba6f9a7eb0f7904ba1662f6175c3f9a8922142e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 15 Apr 2026 13:07:51 +0200 Subject: [PATCH 2/5] Add Oracle Linux 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- docker-bake.hcl | 14 ++++++++++++++ hack/scripts/rpm-init.sh | 4 ++++ hack/scripts/verify-rpm-init.sh | 5 +++++ 3 files changed, 23 insertions(+) diff --git a/docker-bake.hcl b/docker-bake.hcl index f60f54a9..5972c34e 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -35,6 +35,7 @@ variable "DISTROS" { "fedora44", "oraclelinux8", "oraclelinux9", + "oraclelinux10", "rhel8", "rhel9", "rhel10", @@ -388,6 +389,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" @@ -478,6 +491,7 @@ function "distroPlatforms" { 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"] diff --git a/hack/scripts/rpm-init.sh b/hack/scripts/rpm-init.sh index 826842b8..ae0062df 100755 --- a/hack/scripts/rpm-init.sh +++ b/hack/scripts/rpm-init.sh @@ -62,6 +62,10 @@ 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 git rpm-build rpmlint dnf-plugins-core oraclelinux-release-el10 oracle-epel-release-el10 + dnf config-manager --enable ol10_addons ol10_codeready_builder + ;; fedora*) dnf install -y git rpm-build rpmlint dnf-plugins-core ;; diff --git a/hack/scripts/verify-rpm-init.sh b/hack/scripts/verify-rpm-init.sh index 4558d9b3..8a9d661b 100755 --- a/hack/scripts/verify-rpm-init.sh +++ b/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 ;; From d9db4aea4f194286318b9feca1179664b5bb15eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 15 Apr 2026 13:33:47 +0200 Subject: [PATCH 3/5] Add Rocky Linux 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Gronowski --- docker-bake.hcl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 5972c34e..594240d1 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -40,7 +40,8 @@ variable "DISTROS" { "rhel9", "rhel10", "rockylinux8", - "rockylinux9" + "rockylinux9", + "rockylinux10" ] } @@ -461,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, @@ -497,6 +510,7 @@ function "distroPlatforms" { 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) ), From 2eefd852b851dc4d8df0954badabda004a70d4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 15 Apr 2026 13:27:37 +0200 Subject: [PATCH 4/5] build: Fix rpmlint installation order for Alma Linux 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rpmlint package requires dependencies from the CRB (CodeReady Builder) repository on Alma Linux 10. Previous installation order was attempting to install rpmlint before the CRB repository was enabled. Signed-off-by: Paweł Gronowski --- hack/scripts/rpm-init.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hack/scripts/rpm-init.sh b/hack/scripts/rpm-init.sh index ae0062df..27805e21 100755 --- a/hack/scripts/rpm-init.sh +++ b/hack/scripts/rpm-init.sh @@ -74,8 +74,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 From 503f625f5dc9153d96e37ea7ced5125c19ea38fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= Date: Wed, 15 Apr 2026 13:42:54 +0200 Subject: [PATCH 5/5] build: Fix rpmlint installation order for Oracle Linux 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rpmlint package requires dependencies from the CRB (CodeReady Builder) repository on Oracle Linux 10. Previous installation order was attempting to install rpmlint before the CRB repository was enabled. Signed-off-by: Paweł Gronowski --- hack/scripts/rpm-init.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/scripts/rpm-init.sh b/hack/scripts/rpm-init.sh index 27805e21..2c0a4d3d 100755 --- a/hack/scripts/rpm-init.sh +++ b/hack/scripts/rpm-init.sh @@ -63,8 +63,9 @@ case "$pkgrelease" in dnf config-manager --enable ol9_addons ol9_codeready_builder ;; oraclelinux10) - dnf install -y git rpm-build rpmlint dnf-plugins-core oraclelinux-release-el10 oracle-epel-release-el10 + 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