static: use default builder

Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker · Jul 4, 2022 · 97e42d3 · 97e42d3
1 parent 9515153
commit 97e42d3
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/static/build-static b/static/build-static
@@ -36,7 +36,7 @@ build_cli() {
 	(
 		cd "${CLI_DIR}"
 		set -x
-		docker buildx build \
+		docker buildx --builder=default build \
 			--build-arg BUILDKIT_MULTI_PLATFORM=true \
 			--build-arg CGO_ENABLED="${cgo_enabled}" \
 			--build-arg DEFAULT_PRODUCT_LICENSE \
@@ -56,7 +56,7 @@ build_engine() {
 		cd "${ENGINE_DIR}"
 		mkdir -p autogen # FIXME: remove when https://github.com/moby/moby/pull/43431 merged
 		set -x
-		docker buildx build \
+		docker buildx --builder=default build \
 			--build-arg CGO_ENABLED="${cgo_enabled}" \
 			--build-arg CONTAINERD_VERSION \
 			--build-arg DEFAULT_PRODUCT_LICENSE \
@@ -79,7 +79,7 @@ build_engine_cross() {
 		cd "${ENGINE_DIR}"
 		mkdir -p autogen # FIXME: remove when https://github.com/moby/moby/pull/43431 merged
 		set -x
-		docker buildx build \
+		docker buildx --builder=default build \
 			--build-arg CGO_ENABLED="${cgo_enabled}" \
 			--build-arg CONTAINERD_VERSION \
 			--build-arg CROSS=true \
@@ -102,7 +102,7 @@ build_buildx() {
 	(
 		cd "${BUILDX_DIR}"
 		set -x
-		docker buildx build \
+		docker buildx --builder=default build \
 			--platform "${TARGETPLATFORM}" \
 			--build-arg BUILDKIT_MULTI_PLATFORM=true \
 			--output "./bin" \
@@ -161,8 +161,7 @@ buildxBuildDir="${buildDir}/docker-buildx"
 composeBuildDir="${buildDir}/docker-compose"
 scanBuildDir="${buildDir}/docker-scan"
 
-# create docker-container builder
-docker buildx inspect | grep -q 'Driver: docker-container' || docker buildx create --use
+docker buildx use default
 
 case ${TARGETOS} in
 	linux)