Skip to content

Commit c32578f

Browse files
committed
Docker Library: 12.3 release based on ubuntu26.04
1 parent 6a0c42c commit c32578f

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

scripts/docker-library-build.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,9 @@ ubi=
4949
arches=( linux/amd64 linux/arm64/v8 linux/ppc64le linux/s390x )
5050

5151
case "${buildername#*ubuntu-}" in
52-
2404-deb-autobake)
53-
pkgver=ubu2404
54-
;;
55-
2204-deb-autobake)
56-
pkgver=ubu2204
52+
*-deb-autobake*)
53+
pkgver=${buildername#*ubuntu-}
54+
pkgver=ubu${pkgver%-deb-autobake*}
5755
;;
5856
*-rhel-*-rpm-autobake)
5957
ubi=-ubi

utils.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,10 @@ def hasDockerLibrary(step: BuildStep) -> bool:
504504
# from https://github.com/MariaDB/mariadb-docker/blob/next/update.sh#L7-L15
505505
if fnmatch.fnmatch(branch, "10.11") or fnmatch.fnmatch(branch, "10.6"):
506506
dockerbase = "ubuntu-2204-deb-autobake"
507-
else:
507+
elif fnmatch.fnmatch(branch, "11.*") or fnmatch.fnmatch(branch, "12.2"):
508508
dockerbase = "ubuntu-2404-deb-autobake"
509+
else:
510+
dockerbase = "ubuntu-2604-deb-autobake"
509511

510512
# UBI images
511513
if builder_name.endswith("amd64-rhel-9-rpm-autobake"):

0 commit comments

Comments
 (0)