From 9958d46b130e175fb94569f975815edfd7348599 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Jun 2025 19:03:22 -0400 Subject: [PATCH] script/build-with-container: add rocky10 to built-in distros Add "rocky10" (also aliased to "rockylinux10") to the known distro bases so that the team can begin to experiment with the Rocky Linux 10 distro for containerized builds. Signed-off-by: John Mulligan (cherry picked from commit 33b33ff129011d71dcbe94fe4b2bb790f98301ad) --- src/script/build-with-container.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/script/build-with-container.py b/src/script/build-with-container.py index dfbf967b5f8c6..838d302553bc8 100755 --- a/src/script/build-with-container.py +++ b/src/script/build-with-container.py @@ -95,12 +95,19 @@ class DistroKind(StrEnum): CENTOS8 = "centos8" CENTOS9 = "centos9" FEDORA41 = "fedora41" + ROCKY10 = "rocky10" UBUNTU2204 = "ubuntu22.04" UBUNTU2404 = "ubuntu24.04" @classmethod def uses_dnf(cls): - return {cls.CENTOS8, cls.CENTOS9, cls.CENTOS10, cls.FEDORA41} + return { + cls.CENTOS10, + cls.CENTOS8, + cls.CENTOS9, + cls.FEDORA41, + cls.ROCKY10, + } @classmethod def uses_rpmbuild(cls): @@ -118,6 +125,8 @@ class DistroKind(StrEnum): "centos9stream": cls.CENTOS9, str(cls.FEDORA41): cls.FEDORA41, "fc41": cls.FEDORA41, + str(cls.ROCKY10): cls.ROCKY10, + 'rockylinux10': cls.ROCKY10, str(cls.UBUNTU2204): cls.UBUNTU2204, "ubuntu-jammy": cls.UBUNTU2204, "jammy": cls.UBUNTU2204, @@ -136,6 +145,7 @@ class DefaultImage(StrEnum): CENTOS8 = "quay.io/centos/centos:stream8" CENTOS9 = "quay.io/centos/centos:stream9" FEDORA41 = "registry.fedoraproject.org/fedora:41" + ROCKY10 = "docker.io/rockylinux/rockylinux:10" UBUNTU2204 = "docker.io/ubuntu:22.04" UBUNTU2404 = "docker.io/ubuntu:24.04" -- 2.39.5