From 25ffd643f45e413e93516c489d70bd2e33f54391 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Tue, 2 Jun 2020 15:41:56 -0400
Subject: [PATCH] Add missing ARCH variable

---
 Makefile            | 2 +-
 images/e2e/Makefile | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9fcee27ec..ac265b7e0 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ endif
 
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 
-BASE_IMAGE ?= $(REGISTRY)/nginx:e3c49c52f4b74fe47ad65d6f3266a02e8b6b622f
+BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx:e3c49c52f4b74fe47ad65d6f3266a02e8b6b622f
 
 GOARCH=$(ARCH)
 
diff --git a/images/e2e/Makefile b/images/e2e/Makefile
index 03b87b917..78cca8162 100644
--- a/images/e2e/Makefile
+++ b/images/e2e/Makefile
@@ -17,9 +17,16 @@ REGISTRY ?= quay.io/kubernetes-ingress-controller
 
 IMAGE = $(REGISTRY)/e2e
 
+HOST_ARCH = $(shell which go >/dev/null 2>&1 && go env GOARCH)
+ARCH ?= $(HOST_ARCH)
+ifeq ($(ARCH),)
+    $(error mandatory variable ARCH is empty, either set it when calling the command or make sure 'go env GOARCH' works)
+endif
+
 .PHONY: image
 image:
 	docker build \
+		--build-arg TARGETARCH="$(ARCH)" \
 		--build-arg K8S_RELEASE=v1.15.7 \
 		--build-arg RESTY_CLI_VERSION=0.25rc2 \
 		--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \