From a87c09fc39d34d7703e6e7589ab23277950998bc Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Fri, 20 Jun 2025 19:34:45 -0400 Subject: [PATCH] Dockerfile.build: make WITH_CRIMSON a build arg We've chosen to enable crimson by default to match the CI, but that is not always something a developer may want, so make WITH_CRIMSON a build argument that can be toggled off if necessary. Signed-off-by: John Mulligan (cherry picked from commit 9cbadc2e6009cbbf3bc757f801d3508da6fe498d) --- Dockerfile.build | 2 ++ src/script/buildcontainer-setup.sh | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.build b/Dockerfile.build index 19e0f78d7d5d1..d75ebdfa04a33 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -23,6 +23,7 @@ ARG CEPH_CTR_SRC=/usr/local/src/ceph ARG CLEAN_DNF=yes ARG CEPH_BASE_BRANCH=main ARG SCCACHE_VERSION=0.8.2 +ARG WITH_CRIMSON=true COPY --from=bootstrap ${CEPH_CTR_SRC} ${CEPH_CTR_SRC} # Note that we do not use ENV for the following. This is because we do not # want them permamently stored in the container's layer. @@ -30,6 +31,7 @@ RUN DISTRO=$DISTRO \ CEPH_BASE_BRANCH=$CEPH_BASE_BRANCH \ CLEAN_DNF=$CLEAN_DNF \ CEPH_CTR_SRC=${CEPH_CTR_SRC} \ + WITH_CRIMSON=${WITH_CRIMSON} \ bash -x ${CEPH_CTR_SRC}/buildcontainer-setup.sh RUN \ SCCACHE_URL="https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-$(uname -m)-unknown-linux-musl.tar.gz"; \ diff --git a/src/script/buildcontainer-setup.sh b/src/script/buildcontainer-setup.sh index 9964ed3241d56..59e5346791cc1 100644 --- a/src/script/buildcontainer-setup.sh +++ b/src/script/buildcontainer-setup.sh @@ -5,7 +5,6 @@ install_container_deps() { # set JENKINS_HOME in order to have the build container look as much # like an existing jenkins build environment as possible export JENKINS_HOME=/ceph - export WITH_CRIMSON=true prepare } -- 2.39.5