From 02c99e9ccf6232e1c9410c9bdce83d7fdb5c421e Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Sun, 26 Jan 2020 21:48:35 -0300
Subject: [PATCH] Update e2e image

---
 build/run-in-docker.sh    | 2 +-
 images/e2e/Dockerfile     | 2 +-
 images/e2e/Makefile       | 5 +++--
 test/e2e-image/Dockerfile | 2 +-
 test/e2e-image/Makefile   | 5 ++++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index 74ebebb09..ab771d54a 100755
--- a/build/run-in-docker.sh
+++ b/build/run-in-docker.sh
@@ -34,7 +34,7 @@ function cleanup {
 }
 trap cleanup EXIT
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01142020-3f0df1c35
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01262020-44fb2a873
 
 DOCKER_OPTS=${DOCKER_OPTS:-}
 
diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
index 588165ce5..394b7a716 100644
--- a/images/e2e/Dockerfile
+++ b/images/e2e/Dockerfile
@@ -38,6 +38,7 @@ RUN apk add --no-cache \
   gcc \
   git \
   musl-dev \
+  perl \
   python \
   openssl
 
@@ -47,7 +48,6 @@ RUN set -eux; \
     pkgconfig \
     openssl \
     unzip \
-    perl \
     go \
   ; \
 	export \
diff --git a/images/e2e/Makefile b/images/e2e/Makefile
index af203bee7..2761cb699 100644
--- a/images/e2e/Makefile
+++ b/images/e2e/Makefile
@@ -23,10 +23,11 @@ docker-build:
 	docker buildx build \
 		--pull \
 		--load \
+		--progress plain \
 		--build-arg K8S_RELEASE=v1.15.7 \
 		--build-arg ETCD_VERSION=v3.3.18 \
-		--build-arg GOLANG_VERSION=1.13.5 \
-		--build-arg GOLANG_SHA=27d356e2a0b30d9983b60a788cf225da5f914066b37a6b4f69d457ba55a626ff \
+		--build-arg GOLANG_VERSION=1.13.6 \
+		--build-arg GOLANG_SHA=aae5be954bdc40bcf8006eb77e8d8a5dde412722bc8effcdaf9772620d06420c \
 		--build-arg RESTY_CLI_VERSION=0.25rc2 \
 		--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
 		-t $(IMAGE):$(TAG) .
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
index 69e371bba..3f25bb94c 100644
--- a/test/e2e-image/Dockerfile
+++ b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v01142020-3f0df1c35 AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v01262020-44fb2a873 AS BASE
 
 FROM alpine:3.11
 
diff --git a/test/e2e-image/Makefile b/test/e2e-image/Makefile
index b6e966a1c..aa5469bfe 100644
--- a/test/e2e-image/Makefile
+++ b/test/e2e-image/Makefile
@@ -25,7 +25,10 @@ endif
 	cp -r ../../deploy/cloud-generic .
 	cp -r ../../deploy/cluster-wide .
 
-	docker build -t nginx-ingress-controller:e2e .
+	docker buildx build \
+		--load \
+		--progress plain \
+		--tag nginx-ingress-controller:e2e .
 
 .PHONY: clean
 clean: