From 8e76fcee4aae102cc55712454a474047c831a697 Mon Sep 17 00:00:00 2001 From: Ian Fijolek Date: Thu, 30 Jan 2020 11:15:27 -0800 Subject: [PATCH] Let's try to fix this again --- .drone.yml | 2 +- Dockerfile | 4 ++-- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8298811..e028c7c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -38,7 +38,7 @@ steps: from_secret: docker_password build_args: - ARCH=arm - - REPO=arm32v6 + - REPO=arm32v7 when: branch: - master diff --git a/Dockerfile b/Dockerfile index 0ceae63..e275235 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,8 @@ FROM ${REPO}/python:3-alpine # Copy mutliarch file to run builds on x86_64 ARG ARCH=x86_64 -COPY --from=qemu-user-static /usr/bin/qemu-* /usr/bin/ -# COPY --from=qemu-user-static /usr/bin/qemu-${ARCH}-* /usr/bin/ +# COPY --from=qemu-user-static /usr/bin/qemu-* /usr/bin/ +COPY --from=qemu-user-static /usr/bin/qemu-${ARCH}-* /usr/bin/ RUN mkdir -p /src WORKDIR /src diff --git a/Makefile b/Makefile index fcf90f4..553a6ae 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ build: .PHONY: cross-build-arm cross-build-arm: - docker build --build-arg REPO=arm32v6 --build-arg ARCH=arm . -t ${DOCKER_TAG}-linux-arm + docker build --build-arg REPO=arm32v7 --build-arg ARCH=arm . -t ${DOCKER_TAG}-linux-arm .PHONY: cross-build-arm64 cross-build-arm64: