From 34b497c2f3652e7d30c7b7476b711fd9f1f4ecac Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 6 Oct 2025 18:48:42 -0700 Subject: [PATCH] src/script: add bookworm to build-with-container.py ..and its friend buildcontainer-setup.sh Signed-off-by: Dan Mick --- src/script/build-with-container.py | 3 +++ src/script/buildcontainer-setup.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/script/build-with-container.py b/src/script/build-with-container.py index ef41fb9573d40..7fd50ea0fc03d 100755 --- a/src/script/build-with-container.py +++ b/src/script/build-with-container.py @@ -109,6 +109,7 @@ class DistroKind(StrEnum): ROCKY10 = "rocky10" UBUNTU2204 = "ubuntu22.04" UBUNTU2404 = "ubuntu24.04" + BOOKWORM = "bookworm" @classmethod def uses_dnf(cls): @@ -147,6 +148,7 @@ class DistroKind(StrEnum): str(cls.UBUNTU2404): cls.UBUNTU2404, "ubuntu-noble": cls.UBUNTU2404, "noble": cls.UBUNTU2404, + str(cls.BOOKWORM): cls.BOOKWORM, } @classmethod @@ -163,6 +165,7 @@ class DefaultImage(StrEnum): ROCKY10 = "docker.io/rockylinux/rockylinux:10" UBUNTU2204 = "docker.io/ubuntu:22.04" UBUNTU2404 = "docker.io/ubuntu:24.04" + BOOKWORM = "docker.io/debian:bookworm" class CommandFailed(Exception): diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh index 59e5346791cc1..e5442f4ab7bdd 100644 --- a/src/script/buildcontainer-setup.sh +++ b/src/script/buildcontainer-setup.sh @@ -41,7 +41,7 @@ case "${CEPH_BASE_BRANCH}~${DISTRO_KIND}" in install_container_deps dnf_clean ;; - *~*ubuntu*) + *~*ubuntu*|*~*debian*) apt-get update apt-get install -y wget reprepro curl software-properties-common lksctp-tools libsctp-dev protobuf-compiler ragel libc-ares-dev install_container_deps -- 2.39.5