Skip to content

Commit cba6f9a

Browse files
committed
Add Oracle Linux 10
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
1 parent 6898b11 commit cba6f9a

3 files changed

Lines changed: 23 additions & 0 deletions

File tree

docker-bake.hcl

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ variable "DISTROS" {
3535
"fedora44",
3636
"oraclelinux8",
3737
"oraclelinux9",
38+
"oraclelinux10",
3839
"rhel8",
3940
"rhel9",
4041
"rhel10",
@@ -388,6 +389,18 @@ target "_distro-oraclelinux9" {
388389
}
389390
}
390391

392+
target "_distro-oraclelinux10" {
393+
args = {
394+
DISTRO_NAME = "oraclelinux10"
395+
DISTRO_TYPE = "rpm"
396+
DISTRO_RELEASE = "oraclelinux"
397+
DISTRO_ID = "10"
398+
DISTRO_SUITE = "10"
399+
DISTRO_IMAGE = DISTRO_IMAGE != null && DISTRO_IMAGE != "" ? DISTRO_IMAGE : "oraclelinux:10"
400+
TEST_ONLY = "1"
401+
}
402+
}
403+
391404
target "_distro-rhel8" {
392405
args = {
393406
DISTRO_NAME = "rhel8"
@@ -478,6 +491,7 @@ function "distroPlatforms" {
478491
fedora44 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
479492
oraclelinux8 = ["linux/amd64", "linux/arm64"]
480493
oraclelinux9 = ["linux/amd64", "linux/arm64"]
494+
oraclelinux10 = ["linux/amd64", "linux/arm64"]
481495
rhel8 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
482496
rhel9 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
483497
rhel10 = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]

hack/scripts/rpm-init.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ case "$pkgrelease" in
6262
dnf install -y git rpm-build rpmlint dnf-plugins-core oraclelinux-release-el9 oracle-epel-release-el9
6363
dnf config-manager --enable ol9_addons ol9_codeready_builder
6464
;;
65+
oraclelinux10)
66+
dnf install -y git rpm-build rpmlint dnf-plugins-core oraclelinux-release-el10 oracle-epel-release-el10
67+
dnf config-manager --enable ol10_addons ol10_codeready_builder
68+
;;
6569
fedora*)
6670
dnf install -y git rpm-build rpmlint dnf-plugins-core
6771
;;

hack/scripts/verify-rpm-init.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ case "$pkgrelease" in
4747
dnf install -y findutils dnf-plugins-core oraclelinux-release-el9 oracle-epel-release-el9
4848
dnf config-manager --enable ol9_addons ol9_codeready_builder
4949
;;
50+
oraclelinux10)
51+
dnf install -y dnf-plugins-core oraclelinux-release-el10 oracle-epel-release-el10
52+
dnf config-manager --enable ol10_addons ol10_codeready_builder
53+
dnf install -y findutils
54+
;;
5055
fedora*|rhel*)
5156
dnf install -y findutils dnf-plugins-core
5257
;;

0 commit comments

Comments
 (0)