Skip to content

Commit 97e42d3

Browse files
committed
static: use default builder
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 9515153 commit 97e42d3

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

static/build-static

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ build_cli() {
3636
(
3737
cd "${CLI_DIR}"
3838
set -x
39-
docker buildx build \
39+
docker buildx --builder=default build \
4040
--build-arg BUILDKIT_MULTI_PLATFORM=true \
4141
--build-arg CGO_ENABLED="${cgo_enabled}" \
4242
--build-arg DEFAULT_PRODUCT_LICENSE \
@@ -56,7 +56,7 @@ build_engine() {
5656
cd "${ENGINE_DIR}"
5757
mkdir -p autogen # FIXME: remove when https://github.com/moby/moby/pull/43431 merged
5858
set -x
59-
docker buildx build \
59+
docker buildx --builder=default build \
6060
--build-arg CGO_ENABLED="${cgo_enabled}" \
6161
--build-arg CONTAINERD_VERSION \
6262
--build-arg DEFAULT_PRODUCT_LICENSE \
@@ -79,7 +79,7 @@ build_engine_cross() {
7979
cd "${ENGINE_DIR}"
8080
mkdir -p autogen # FIXME: remove when https://github.com/moby/moby/pull/43431 merged
8181
set -x
82-
docker buildx build \
82+
docker buildx --builder=default build \
8383
--build-arg CGO_ENABLED="${cgo_enabled}" \
8484
--build-arg CONTAINERD_VERSION \
8585
--build-arg CROSS=true \
@@ -102,7 +102,7 @@ build_buildx() {
102102
(
103103
cd "${BUILDX_DIR}"
104104
set -x
105-
docker buildx build \
105+
docker buildx --builder=default build \
106106
--platform "${TARGETPLATFORM}" \
107107
--build-arg BUILDKIT_MULTI_PLATFORM=true \
108108
--output "./bin" \
@@ -161,8 +161,7 @@ buildxBuildDir="${buildDir}/docker-buildx"
161161
composeBuildDir="${buildDir}/docker-compose"
162162
scanBuildDir="${buildDir}/docker-scan"
163163

164-
# create docker-container builder
165-
docker buildx inspect | grep -q 'Driver: docker-container' || docker buildx create --use
164+
docker buildx use default
166165

167166
case ${TARGETOS} in
168167
linux)

0 commit comments

Comments
 (0)