From eb6e2191d57ca21b4fdedeb03b0d71daabcaaf46 Mon Sep 17 00:00:00 2001 From: Carl Tashian Date: Tue, 18 Aug 2020 16:15:58 -0700 Subject: [PATCH] Docker build tweaks --- debian/changelog | 4 ++-- make/docker.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 48efaee7..795d0818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -step-certificates (0.8.4-14-ge72f087-dev) unstable; urgency=medium +step-certificates (0.15.1~rc.1~2~gd073a0a~dev) unstable; urgency=medium * See https://github.com/smallstep/certificates/releases - -- Smallstep Labs, Inc. Wed, 20 Feb 2019 20:44:25 +0000 + -- Smallstep Labs, Inc. Tue, 18 Aug 2020 18:40:32 +0000 diff --git a/make/docker.mk b/make/docker.mk index 2eb60a9c..7efc4a60 100644 --- a/make/docker.mk +++ b/make/docker.mk @@ -21,14 +21,14 @@ DOCKER_IMAGE_NAME = smallstep/step-ca docker-prepare: # Ensure, we can build for ARM architecture ifeq (linux,$(DOCKER_CLIENT_OS)) - [ -f /proc/sys/fs/binfmt_misc/qemu-arm ] || docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64 + [ -f /proc/sys/fs/binfmt_misc/qemu-arm ] || docker run --rm --privileged linuxkit/binfmt:v0.8-amd64 endif # Register buildx builder mkdir -p $$HOME/.docker/cli-plugins test -f $$HOME/.docker/cli-plugins/docker-buildx || \ - (wget -O $$HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.$(DOCKER_CLIENT_OS)-amd64 && \ + (wget -q -O $$HOME/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.$(DOCKER_CLIENT_OS)-amd64 && \ chmod +x $$HOME/.docker/cli-plugins/docker-buildx) # Called directly instead of via `docker buildx` because