From 2944ffb8c8081caf6e736b06d054c74fdceabbf1 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Fri, 8 Mar 2019 16:44:47 -0800
Subject: [PATCH] Updated

---
 .gitignore  |  4 +---
 Dockerfile  |  2 +-
 Makefile    | 21 ++++++++++++++++-----
 get_qemu.sh |  3 +++
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6e6de7e..604a3bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-qemu-aarch64-static
-qemu-arm-static
-qemu-x86_64-static
+qemu-*
 *.tar.gz
diff --git a/Dockerfile b/Dockerfile
index 9928ed9..b7ba5f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG REPO=library
 FROM ${REPO}/python:3-alpine
 
 ARG ARCH=x86_64
-COPY ./qemu-${ARCH}-static /usr/bin/
+COPY ./build/qemu-${ARCH}-static /usr/bin/
 
 
 RUN mkdir -p /src
diff --git a/Makefile b/Makefile
index 96d702d..f73122f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,35 @@
 DOCKER_TAG ?= cloudflare-ddns-dev-${USER}
+
+.PHONY: default
 default: test
 
+.PHONY:test
 test:
 	@echo ok
 
+.PHONY: update
 update:
 	curl -o update_ddns.py https://raw.githubusercontent.com/cloudflare/python-cloudflare/master/examples/example_update_dynamic_dns.py
 	chmod +x update_ddns.py
 
-build:
+.PHONY: build
+build: build/qemu-x86_64-static
 	docker build . -t ${DOCKER_TAG}
 
 build/qemu-arm-static:
-	mkdir -p build
-	wget -N https://github.com/multiarch/qemu-user-static/releases/download/v2.9.1-1/x86_64_qemu-${target_arch}-static.tar.gz
-	tar -xvf x86_64_qemu-${target_arch}-static.tar.gz
+	./get_qemu.sh
 
-cross-build-arm32v6:
+build/qemu-x86_64-static:
+	./get_qemu.sh
+
+build/qemu-aarch64-static:
+	./get_qemu.sh
+
+.PHONY: cross-build-arm32v6
+cross-build-arm32v6: build/qemu-arm-static
 	docker build --build-arg REPO=arm32v6 --build-arg ARCH=arm . -t ${DOCKER_TAG}-arm32v6
 
+.PHONY: run
 run: build
 	docker run --rm -e DOMAIN=${DOMAIN} \
 		-e CF_API_EMAIL=${CF_API_EMAIL} \
diff --git a/get_qemu.sh b/get_qemu.sh
index 46e3df7..c9e0314 100755
--- a/get_qemu.sh
+++ b/get_qemu.sh
@@ -3,6 +3,9 @@
 HOST_ARCH=x86_64
 VERSION=v2.9.1-1
 
+mkdir -p build
+cd build
+
 for target_arch in aarch64 arm x86_64; do
   wget -N https://github.com/multiarch/qemu-user-static/releases/download/$VERSION/${HOST_ARCH}_qemu-${target_arch}-static.tar.gz
   tar -xvf ${HOST_ARCH}_qemu-${target_arch}-static.tar.gz