Merge pull request #27 from dweomer/fix-drone-push-images

drone: fix the building/pushing of images in drone
rancher · Feb 11, 2020 · 1510bb8 · 1510bb8
2 parents 7d30ba4 + b45b97b
commit 1510bb8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/.drone.yml b/.drone.yml
@@ -41,6 +41,9 @@ steps:
   image: plugins/docker
   settings:
     dockerfile: package/Dockerfile
+    build_args:
+    - ARCH=amd64
+    - TAG=${DRONE_TAG}-amd64
     password:
       from_secret: docker_password
     repo: "rancher/system-upgrade-controller"
@@ -60,6 +63,9 @@ steps:
   image: plugins/docker
   settings:
     dockerfile: package/Dockerfile
+    build_args:
+    - ARCH=amd64
+    - TAG=${DRONE_TAG}-amd64
     target: e2e-tests
     password:
       from_secret: docker_password
@@ -123,6 +129,9 @@ steps:
   image: plugins/docker
   settings:
     dockerfile: package/Dockerfile
+    build_args:
+    - ARCH=arm64
+    - TAG=${DRONE_TAG}-arm64
     password:
       from_secret: docker_password
     repo: "rancher/system-upgrade-controller"
@@ -142,6 +151,9 @@ steps:
   image: plugins/docker
   settings:
     dockerfile: package/Dockerfile
+    build_args:
+    - ARCH=arm64
+    - TAG=${DRONE_TAG}-arm64
     target: e2e-tests
     password:
       from_secret: docker_password
@@ -205,6 +217,9 @@ steps:
   image: plugins/docker
   settings:
     dockerfile: package/Dockerfile
+    build_args:
+    - ARCH=arm
+    - TAG=${DRONE_TAG}-arm
     password:
       from_secret: docker_password
     repo: "rancher/system-upgrade-controller"

diff --git a/package/Dockerfile b/package/Dockerfile
@@ -11,7 +11,7 @@ RUN set -x \
 
 FROM ${ALPINE} AS e2e-tests
 ARG ARCH
-ARG REPO
+ARG REPO=rancher
 ARG TAG
 ENV SYSTEM_UPGRADE_CONTROLLER_IMAGE=${REPO}/system-upgrade-controller:${TAG}
 RUN set -x \