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.

Conflicts:
	Dockerfile.build

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 9cbadc2e6009cbbf3bc757f801d3508da6fe498d)

diff --git a/Dockerfile.build b/Dockerfile.build
index 19e0f78d7d5d1bf0a34369ff9f9aee32506c1676..d75ebdfa04a331393eb675c7543eaa6cb2a78a7d 100644 (file)
--- 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 9964ed3241d56ac97887def8d4a7f3d620142c0c..59e5346791cc14f3be5fd14b774d299b9abf78ed 100644 (file)
--- 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
 }