From: Bastien Wirtz Date: Wed, 20 May 2020 03:41:05 +0000 (-0700) Subject: Fix multiarch docker build. X-Git-Tag: 120405250~6^2~2 X-Git-Url: https://git.immae.eu/?p=github%2Fbastienwirtz%2Fhomer.git;a=commitdiff_plain;h=c92844bd0ed19747d0f06701475adbf73a3ab0e1 Fix multiarch docker build. --- diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7 index 79a7a61..58a1834 100644 --- a/Dockerfile.arm32v7 +++ b/Dockerfile.arm32v7 @@ -1,4 +1,5 @@ FROM arm32v7/alpine:3.11 +COPY qemu-arm-static /usr/bin COPY ./ /www/ diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index 707dd83..69132a3 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -1,4 +1,5 @@ FROM arm64v8/alpine:3.11 +COPY qemu-arm-static /usr/bin COPY ./ /www/ diff --git a/hooks/post_push b/hooks/post_push index d721b68..08384f3 100644 --- a/hooks/post_push +++ b/hooks/post_push @@ -1,5 +1,10 @@ #!/bin/bash +#!/bin/bash +# downloads a local copy of qemu on docker-hub build machines +curl -L https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz | tar zxvf - -C . && mv qemu-3.0.0+resin-arm/qemu-arm-static . + + docker manifest push --purge b4bz/homer:latest docker manifest create b4bz/homer:latest b4bz/homer:latest-amd64 b4bz/homer:latest-arm32v7 b4bz/homer:latest-arm64v8 docker manifest annotate b4bz/homer:latest b4bz/homer:latest-arm32v7 --os linux --arch arm