From e20d651ceb10c09585b447c90eaf370f2bd0d9e0 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Mon, 12 Nov 2018 11:29:18 -0300
Subject: [PATCH] Update nginx and e2e image

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

diff --git a/Makefile b/Makefile
index 2ab0f85af..d4578694d 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,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.67
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.69
 
 ifeq ($(ARCH),arm)
 	QEMUARCH=arm
diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh
index a4c21a90d..a508d89a6 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:v11032018-1978bed
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v11122018-14fe4898a
 
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
index 17e6c18df..ec0bed786 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.66
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.69
 
 RUN clean-install \
   g++ \
@@ -25,9 +25,9 @@ RUN clean-install \
   python \
   pkg-config
 
-ENV GOLANG_VERSION 1.11
+ENV GOLANG_VERSION 1.11.2
 ENV GO_ARCH        linux-amd64
-ENV GOLANG_SHA     b3fcf280ff86558e0559e185b601c9eade0fd24c900b4c63cd14d1d38613e499
+ENV GOLANG_SHA     1dfe664fa3d8ad714bbd15a36627992effd150ddabd7523931f077b3926d736d
 
 RUN set -eux; \
   url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \