Docker library (fix 20.04 EOL) + RHEL10 base #803
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
c4ca50e had a regression where additional ] ended up in the fnmatch resulting in the 10.6 no being triggered for Ubuntu based images, and 10.11 being triggered with a 24.04 base instead of 22.04.
With the release of RHEL10, and Docker Official Images supporting it, MariaDB 12+ release will be based on RHEL10.
RazvanLiviuVarzaru
approved these changes
Jul 16, 2025
There was a problem hiding this comment.
Otherwise, looks ok to me,
made some short tests and they pass.
import unittest
from test import hasDockerLibrary
class TestHasDockerLibrary(unittest.TestCase):
def test_ubuntu_2204_branch(self):
self.assertTrue(hasDockerLibrary("ubuntu-2204-deb-autobake", "10.11"))
self.assertTrue(hasDockerLibrary("ubuntu-2204-deb-autobake", "10.6"))
self.assertFalse(hasDockerLibrary("ubuntu-2204-deb-autobake", "11.4"))
self.assertFalse(hasDockerLibrary("ubuntu-2204-deb-autobake", "12.1"))
def test_ubuntu_2404_branch(self):
self.assertTrue(hasDockerLibrary("ubuntu-2404-deb-autobake", "11.4"))
self.assertFalse(hasDockerLibrary("ubuntu-2404-deb-autobake", "10.11"))
def test_rhel9_with_10_or_11(self):
self.assertTrue(hasDockerLibrary("amd64-rhel-9-rpm-autobake", "10.6"))
self.assertTrue(hasDockerLibrary("amd64-rhel-9-rpm-autobake", "11.4"))
self.assertFalse(hasDockerLibrary("amd64-rhel-9-rpm-autobake", "12.1"))
def test_rhel10_with_not_10_or_11(self):
self.assertFalse(hasDockerLibrary("amd64-rhel-10-rpm-autobake", "10.11"))
self.assertFalse(hasDockerLibrary("amd64-rhel-10-rpm-autobake", "11.4"))
self.assertTrue(hasDockerLibrary("amd64-rhel-10-rpm-autobake", "12.1"))
def test_non_matching_builder(self):
self.assertFalse(hasDockerLibrary("some-random-builder", "10.11"))
self.assertFalse(hasDockerLibrary("some-other-builder", "12.0"))
if __name__ == "__main__":
unittest.main()where
import fnmatch
def hasDockerLibrary(builder_name, branch) -> bool:
branch = branch
builder_name = builder_name
# from https://github.com/MariaDB/mariadb-docker/blob/next/update.sh#L7-L15
if fnmatch.fnmatch(branch, "10.11") or fnmatch.fnmatch(branch, "10.6"):
dockerbase = "ubuntu-2204-deb-autobake"
else:
dockerbase = "ubuntu-2404-deb-autobake"
# UBI images
if builder_name.endswith("amd64-rhel-9-rpm-autobake"):
return fnmatch.fnmatch(branch, "10.*") or fnmatch.fnmatch(branch, "11.*")
if builder_name.endswith("amd64-rhel-10-rpm-autobake"):
return not (fnmatch.fnmatch(branch, "10.*") or fnmatch.fnmatch(branch, "11.*"))
# We only build on the above autobakes for all architectures
return builder_name.endswith(dockerbase)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adjust the triggers for Docker Library:
Supported by MariaDB/mariadb-docker#653