From fc45ab2ac3f81474641527b395c59cc476716063 Mon Sep 17 00:00:00 2001 From: Lance Linder Date: Tue, 7 Sep 2021 12:40:03 -0500 Subject: [PATCH] Possible fix for multi-arch build failures Enables buildx in an attempt to resolve issue #14 --- build-bin/docker/docker_build | 2 +- build-bin/docker/docker_push | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-bin/docker/docker_build b/build-bin/docker/docker_build index d9cb4fb..8faa8a4 100755 --- a/build-bin/docker/docker_build +++ b/build-bin/docker/docker_build @@ -24,4 +24,4 @@ docker_args=$($(dirname "$0")/docker_args ${version}) # * It only supports one platform/arch on load https://github.com/docker/buildx/issues/59 # * It would pull Docker Hub for moby/buildkit or multiarch/qemu-user-static images, using up quota echo "Building image ${docker_tag}" -DOCKER_BUILDKIT=0 docker build --pull ${docker_args} --tag ${docker_tag} . +DOCKER_BUILDKIT=1 docker build --pull ${docker_args} --tag ${docker_tag} . diff --git a/build-bin/docker/docker_push b/build-bin/docker/docker_push index 9947e9c..7c58ac9 100755 --- a/build-bin/docker/docker_push +++ b/build-bin/docker/docker_push @@ -27,7 +27,7 @@ set -ue docker_image=${1?docker_image is required, notably without a tag. Ex openzipkin/zipkin} version=${2:-master} -export DOCKER_BUILDKIT=0 +export DOCKER_BUILDKIT=1 case ${version} in master )