From 6cfab3ea179c288d79532376c1d3f08638aceb5b Mon Sep 17 00:00:00 2001 From: Shyam Sunder Date: Wed, 26 Aug 2020 17:37:54 -0400 Subject: [PATCH] docker/build: trying again... --- client/hooks/build | 1 + client/hooks/pre_build | 2 -- server/hooks/build | 1 + server/hooks/pre_build | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/hooks/build b/client/hooks/build index eb02cbc9..513d8620 100755 --- a/client/hooks/build +++ b/client/hooks/build @@ -16,4 +16,5 @@ docker buildx build \ --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ --build-arg SOURCE_COMMIT \ --build-arg DOCKER_REPO \ + --progress plain --load \ -f $DOCKERFILE_PATH -t $IMAGE_NAME . diff --git a/client/hooks/pre_build b/client/hooks/pre_build index 7b443485..9a41e0d4 100755 --- a/client/hooks/pre_build +++ b/client/hooks/pre_build @@ -2,8 +2,6 @@ export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_BUILDKIT=1 -docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -docker buildx rm builder docker buildx create \ --name builder \ --driver docker-container \ diff --git a/server/hooks/build b/server/hooks/build index 1bba46c4..89f45018 100755 --- a/server/hooks/build +++ b/server/hooks/build @@ -7,4 +7,5 @@ docker buildx build \ --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \ --build-arg SOURCE_COMMIT \ --build-arg DOCKER_REPO \ + --progress plain --load \ -f $DOCKERFILE_PATH -t $IMAGE_NAME . diff --git a/server/hooks/pre_build b/server/hooks/pre_build index 7b443485..9a41e0d4 100755 --- a/server/hooks/pre_build +++ b/server/hooks/pre_build @@ -2,8 +2,6 @@ export DOCKER_CLI_EXPERIMENTAL=enabled export DOCKER_BUILDKIT=1 -docker run --rm --privileged multiarch/qemu-user-static --reset -p yes -docker buildx rm builder docker buildx create \ --name builder \ --driver docker-container \