Skip to content

Commit 9cbadc2

Browse files
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 <[email protected]>
1 parent ae7878d commit 9cbadc2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Dockerfile.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ ARG CEPH_CTR_SRC=/usr/local/src/ceph
2323
ARG CLEAN_DNF=yes
2424
ARG CEPH_BASE_BRANCH=main
2525
ARG SCCACHE_VERSION=0.8.2
26+
ARG WITH_CRIMSON=true
2627
COPY --from=bootstrap ${CEPH_CTR_SRC} ${CEPH_CTR_SRC}
2728
# Note that we do not use ENV for the following. This is because we do not
2829
# want them permamently stored in the container's layer.
2930
RUN DISTRO=$DISTRO \
3031
CEPH_BASE_BRANCH=$CEPH_BASE_BRANCH \
3132
CLEAN_DNF=$CLEAN_DNF \
3233
CEPH_CTR_SRC=${CEPH_CTR_SRC} \
34+
WITH_CRIMSON=${WITH_CRIMSON} \
3335
bash -x ${CEPH_CTR_SRC}/buildcontainer-setup.sh
3436
RUN \
3537
SCCACHE_URL="https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-$(uname -m)-unknown-linux-musl.tar.gz"; \

src/script/buildcontainer-setup.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ install_container_deps() {
55
# set JENKINS_HOME in order to have the build container look as much
66
# like an existing jenkins build environment as possible
77
export JENKINS_HOME=/ceph
8-
export WITH_CRIMSON=true
98
prepare
109
}
1110

0 commit comments

Comments
 (0)