Skip to content

Commit 5a9e51d

Browse files
grooverdanRazvanLiviuVarzaru
authored andcommitted
docker library: ubi MariaDB < 12 is with rhel9 otherwise rhel10
With the release of RHEL10, and Docker Official Images supporting it, MariaDB 12+ release will be based on RHEL10.
1 parent e713d82 commit 5a9e51d

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

scripts/docker-library-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ case "${buildername#*ubuntu-}" in
5555
2204-deb-autobake)
5656
pkgver=ubu2204
5757
;;
58-
*-rhel-9-rpm-autobake)
58+
*-rhel-*-rpm-autobake)
5959
ubi=-ubi
6060
# first arch only
6161
arches=( linux/amd64 )

scripts/docker-library-manifest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ else
2323
fi
2424

2525
ubi=
26-
if [[ "$buildername" = *-rhel-9-rpm-autobake ]]; then
26+
if [[ "$buildername" = *-rhel-*-rpm-autobake ]]; then
2727
ubi=-ubi
2828
master_branch=${master_branch}-ubi
2929
fi

utils.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,10 @@ def hasDockerLibrary(step: BuildStep) -> bool:
493493

494494
# UBI images
495495
if builder_name.endswith("amd64-rhel-9-rpm-autobake"):
496-
return True
496+
return fnmatch.fnmatch(branch, "10.*") or fnmatch.fnmatch(branch, "11.*")
497+
498+
if builder_name.endswith("amd64-rhel-10-rpm-autobake"):
499+
return not (fnmatch.fnmatch(branch, "10.*") or fnmatch.fnmatch(branch, "11.*"))
497500

498501
# We only build on the above autobakes for all architectures
499502
return builder_name.endswith(dockerbase)

0 commit comments

Comments
 (0)