From 935ecd78ea27da4ff9d59138586b9b79f2c9a13e Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Tue, 5 Feb 2019 14:38:40 -0700
Subject: [PATCH] Fix arm image

---
 .drone.yml              |  6 ++----
 Dockerfile.dapper       |  1 -
 package/Dockerfile.arm  |  4 ----
 package/Dockerfile.arm2 | 10 ----------
 4 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 package/Dockerfile.arm
 delete mode 100644 package/Dockerfile.arm2

diff --git a/.drone.yml b/.drone.yml
index 4f96339..a9c29dc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -90,13 +90,11 @@ name: arm
 
 platform:
   os: linux
-  arch: arm64
+  arch: arm
 
 steps:
 - name: build
   image: rancher/dapper:v0.4.1
-  environment:
-    DAPPER_HOST_ARCH: arm
   commands:
   - dapper ci
   volumes:
@@ -106,7 +104,7 @@ steps:
 - name: docker-publish
   image: plugins/docker
   settings:
-    dockerfile: package/Dockerfile.arm
+    dockerfile: package/Dockerfile
     password:
       from_secret: docker_password
     repo: "rancher/klipper-helm"
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 202e9d0..dca7979 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -1,5 +1,4 @@
 FROM golang:1.11-alpine
-# FROM arm=golang@sha256:9677abaf94d699258b23e107fc6aaa8935938b1f3cb9c79ada24045e5aeebee4
 
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
diff --git a/package/Dockerfile.arm b/package/Dockerfile.arm
deleted file mode 100644
index 98bab48..0000000
--- a/package/Dockerfile.arm
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM alpine@sha256:6d94d2806ccbe3b6036b2cd55c61260f474692b6987c21386e32ef54bc40200a
-RUN apk add -U --no-cache iptables
-COPY entry /usr/bin/
-CMD ["entry"]
diff --git a/package/Dockerfile.arm2 b/package/Dockerfile.arm2
deleted file mode 100644
index 1e5cd6d..0000000
--- a/package/Dockerfile.arm2
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM alpine@sha256:6d94d2806ccbe3b6036b2cd55c61260f474692b6987c21386e32ef54bc40200a as extract
-RUN apk add -U curl ca-certificates
-ARG ARCH
-RUN curl https://storage.googleapis.com/kubernetes-helm/helm-v2.12.3-linux-${ARCH}.tar.gz | tar xvzf - --strip-components=1 -C /usr/bin
-
-FROM alpine@sha256:6d94d2806ccbe3b6036b2cd55c61260f474692b6987c21386e32ef54bc40200a
-RUN apk add -U --no-cache ca-certificates jq bash
-COPY --from=extract /usr/bin/helm /usr/bin/tiller /usr/bin/
-COPY entry /usr/bin/
-ENTRYPOINT ["entry"]