Docker build tweaks

This commit is contained in:
Carl Tashian 2020-08-18 16:15:58 -07:00
parent 741fd143af
commit eb6e2191d5
2 changed files with 4 additions and 4 deletions

4
debian/changelog vendored
View file

@ -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. <techadmin@smallstep.com> Wed, 20 Feb 2019 20:44:25 +0000
-- Smallstep Labs, Inc. <techadmin@smallstep.com> Tue, 18 Aug 2020 18:40:32 +0000

View file

@ -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