Skip to content

Commit 2b05150

Browse files
authored
packaging: build: Make to be able to replace docker cli via environment variable (#8612)
* packaging: build: Make to be able to replace docker cli via environment variable Signed-off-by: Hiroshi Hatake <[email protected]> * packaging: build: Suppress a shellcheck error Signed-off-by: Hiroshi Hatake <[email protected]> --------- Signed-off-by: Hiroshi Hatake <[email protected]>
1 parent 0b9a0e1 commit 2b05150

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

packaging/build.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ FLB_DISTRO=${FLB_DISTRO:-}
1010
FLB_OUT_DIR=${FLB_OUT_DIR:-}
1111
FLB_NIGHTLY_BUILD=${FLB_NIGHTLY_BUILD:-}
1212
FLB_JEMALLOC=${FLB_JEMALLOC:-On}
13+
DOCKER=${FLB_DOCKER_CLI:-docker}
1314

1415
# Use this to pass special arguments to docker build
1516
FLB_ARG=${FLB_ARG:-}
@@ -76,11 +77,15 @@ echo "CMAKE_INSTALL_PREFIX => $CMAKE_INSTALL_PREFIX"
7677
echo "FLB_NIGHTLY_BUILD => $FLB_NIGHTLY_BUILD"
7778
echo "FLB_JEMALLOC => $FLB_JEMALLOC"
7879

79-
export DOCKER_BUILDKIT=1
80+
if [ "${DOCKER}" = "docker" ]; then
81+
export DOCKER_BUILDKIT=1
82+
else
83+
export DOCKER_BUILDKIT=0
84+
fi
8085

8186
# Build the main image - we do want word splitting
8287
# shellcheck disable=SC2086
83-
if ! docker build \
88+
if ! ${DOCKER} build \
8489
--build-arg CMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \
8590
--build-arg FLB_NIGHTLY_BUILD="$FLB_NIGHTLY_BUILD" \
8691
--build-arg FLB_JEMALLOC="$FLB_JEMALLOC" \
@@ -95,7 +100,7 @@ then
95100
fi
96101

97102
# Compile and package
98-
if ! docker run \
103+
if ! ${DOCKER} run \
99104
-v "$volume":/output \
100105
"$MAIN_IMAGE"
101106
then

0 commit comments

Comments
 (0)