From 2b41676824e290f207b2a9355b7b1948b2ccfe48 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Thu, 30 Jan 2020 11:09:56 -0800
Subject: [PATCH] Copy all qemu files because drone is being weird

Change qemu version
---
 .drone.yml | 4 ++--
 Dockerfile | 7 ++++---
 Makefile   | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8298811..80bdee4 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,3 +1,4 @@
+---
 kind: pipeline
 name: linux-amd64
 
@@ -38,7 +39,7 @@ steps:
         from_secret: docker_password
       build_args:
         - ARCH=arm
-        - REPO=arm32v6
+        - REPO=arm32v7
     when:
       branch:
         - master
@@ -98,4 +99,3 @@ steps:
       event:
         - push
         - tag
-
diff --git a/Dockerfile b/Dockerfile
index 7d45d15..f71fe46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,15 @@
 ARG REPO=library
 
-FROM multiarch/qemu-user-static:4.1.0-1 as qemu-user-static
+FROM multiarch/qemu-user-static:4.2.0-2 as qemu-user-static
 # Make sure a dummy x86_64 file exists so that the copy command doesn't error
-RUN touch /usr/bin/qemu-x86_64-fake
+# RUN touch /usr/bin/qemu-x86_64-fake
 
 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-${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: