From 7283a01b9f6f75559cb62f2a8e57097d2ac13b21 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Wed, 17 Apr 2019 22:45:51 -0400
Subject: [PATCH] Update nginx image and Go to 1.12.4 (#4010)

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

diff --git a/Makefile b/Makefile
index 0a03c9cf6..1e3942f2c 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.84
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.85
 
 ifeq ($(ARCH),arm64)
 	QEMUARCH=aarch64
diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh
index 5d3e8d51a..cd9cc0f19 100755
--- a/build/go-in-docker.sh
+++ b/build/go-in-docker.sh
@@ -40,7 +40,7 @@ if [ "$missing" = true ];then
   exit 1
 fi
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04062019-3dc4253b7
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04172019-3fa3923cb
 
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
index d9c56276e..8dc2fbf70 100644
--- a/images/e2e/Dockerfile
+++ b/images/e2e/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.84
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.85
 
 RUN clean-install \
   g++ \
@@ -25,9 +25,9 @@ RUN clean-install \
   python \
   pkg-config
 
-ENV GOLANG_VERSION 1.12.1
+ENV GOLANG_VERSION 1.12.4
 ENV GO_ARCH        linux-amd64
-ENV GOLANG_SHA     2a3fdabf665496a0db5f41ec6af7a9b15a49fbe71a85a50ca38b1f13a103aeec
+ENV GOLANG_SHA     d7d1f1f88ddfe55840712dc1747f37a790cbcaa448f6c9cf51bbe10aa65442f5
 
 RUN set -eux; \
   url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
index cd676c460..2b0297b91 100644
--- a/test/e2e-image/Dockerfile
+++ b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v04062019-3dc4253b7 AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v04172019-3fa3923cb AS BASE
 
 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1