Fix arm image

k3s-io · Feb 5, 2019 · 935ecd7 · 935ecd7
1 parent a6fee54
commit 935ecd7
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git 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
@@ -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
diff --git a/package/Dockerfile.arm2 b/package/Dockerfile.arm2