From 39ed1d93f5cfdd52ed7d6295dc0c4b106d9b2f42 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Fri, 26 Apr 2019 16:20:23 +0200
Subject: [PATCH] Dropped building of ARM images in Travis CI in favor of
 manual building

---
 .travis.yml | 20 +++-----------------
 .void       |  0
 Dockerfile  |  6 +-----
 README.md   | 14 +++++---------
 4 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 .void

diff --git a/.travis.yml b/.travis.yml
index 89ec6f91..cf9f20c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,14 @@
 sudo: required
 services:
   - docker
-branches:
-  only:
-    - master
 env:
   global:
     - DOCKER_BUILD=qmcgaw/private-internet-access
     - MICROBADGER_CODE=tQFy7AxtSUNANPe6aoVChYdsI_I=
   matrix:
-    - TARGET_IMAGE=${DOCKER_BUILD}
-    - ARCH=armhf
-      BASE_IMAGE=arm32v6/alpine
-      TARGET_IMAGE=${DOCKER_BUILD}:${ARCH}
-      QEMU=https://github.com/multiarch/qemu-user-static/releases/download/v3.1.0-3/qemu-arm-static
-    - ARCH=aarch64
-      BASE_IMAGE=arm64v8/alpine
-      TARGET_IMAGE=${DOCKER_BUILD}:${ARCH}
-      QEMU=https://github.com/multiarch/qemu-user-static/releases/download/v3.1.0-3/qemu-arm-static
+    - name=x86_64
 script:
-  - set -e
-  - echo "$DOCKER_PASSWORD" | docker login -u qmcgaw --password-stdin
-  - docker run --rm --privileged multiarch/qemu-user-static:register --reset
-  - docker build -t ${TARGET_IMAGE} --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg QEMU=${QEMU} --build-arg VCF=${TRAVIS_COMMIT} --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" .
-  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker push ${DOCKER_BUILD} || false'
+  - docker build .
+after_script:
   - "curl -X POST https://hooks.microbadger.com/images/${DOCKER_BUILD}/${MICROBADGER_CODE}"
   
\ No newline at end of file
diff --git a/.void b/.void
deleted file mode 100644
index e69de29b..00000000
diff --git a/Dockerfile b/Dockerfile
index 0ff25c93..5e708104 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,8 @@
 ARG BASE_IMAGE
 
 FROM ${BASE_IMAGE:-alpine}:3.9
-ARG QEMU=
 ARG BUILD_DATE
 ARG VCS_REF
-# Only installed for ARM devices
-ADD .void ${QEMU}? /usr/bin/
 LABEL org.label-schema.schema-version="1.0.0-rc1" \
       maintainer="quentin.mcgaw@gmail.com" \
       org.label-schema.build-date=$BUILD_DATE \
@@ -67,5 +64,4 @@ RUN chown nonrootuser -R /etc/unbound && \
         /etc/unbound/root.hints \
         /etc/unbound/root.key \
         /etc/unbound/unbound.conf \
-        /etc/unbound/*.bz2 && \
-    rm -f /usr/bin/qemu-arm-static /usr/bin/.void
+        /etc/unbound/*.bz2
diff --git a/README.md b/README.md
index fe57ee9c..958e7990 100644
--- a/README.md
+++ b/README.md
@@ -75,8 +75,7 @@
     modprobe tun
     ```
 
-1. **ONLY IF YOU HAVE AN ARM DEVICE, depending on your cpu architecture,** replace `qmcgaw/private-internet-access`
-   with either `qmcgaw/private-internet-access:armhf` (32 bit) or `qmcgaw/private-internet-access:aarch64` (64 bit).
+1. **IF YOU HAVE AN ARM DEVICE, follow the steps** in the [ARM devices section](#arm-devices)
 
 1. Launch the container with:
 
@@ -248,21 +247,18 @@ services:
 
 ## ARM devices
 
-If you want to save 3-5MB on the image (because of QEMU), use the following command on
-your ARM device:
-
-- If your architecture is ARMHF (32 bit)
+- If your architecture is ARMHF (32 bit), run this on your ARM device:
 
     ```sh
-    docker build -t qmcgaw/private-internet-access:armhf \
+    docker build -t qmcgaw/private-internet-access \
     --build-arg BASE_IMAGE=arm32v6/alpine \
     https://github.com/qdm12/private-internet-access-docker.git
     ```
 
-- If your architecture is AARCH64 (64 bit)
+- If your architecture is AARCH64 (64 bit), run this on your ARM device:
 
     ```sh
-    docker build -t qmcgaw/private-internet-access:aarch64 \
+    docker build -t qmcgaw/private-internet-access \
     --build-arg BASE_IMAGE=arm64v8/alpine \
     https://github.com/qdm12/private-internet-access-docker.git
     ```