From 0ae589293556fef59368d5709f6c7dc11d36ca87 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Wed, 18 Dec 2019 09:32:20 -0300
Subject: [PATCH] Update nginx image (#4848)

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

diff --git a/Makefile b/Makefile
index d523080dd8..9ed73946a3 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ export E2E_CHECK_LEAKS
 export SLOW_E2E_THRESHOLD
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):97c59728dc26300675fbd3c8836046faced05044
+BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):870be3bcd88c267f14fd82da82303472f383cd14
 
 ifeq ($(ARCH),arm)
 	QEMUARCH=arm
diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index 3af436e627..9080698c03 100755
--- a/build/run-in-docker.sh
+++ b/build/run-in-docker.sh
@@ -30,7 +30,7 @@ function cleanup {
 }
 trap cleanup EXIT
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v12022019-e864fc719
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v12182019-870be3bcd
 
 DOCKER_OPTS=${DOCKER_OPTS:-}
 
diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
index 0acdd1fea6..65866bf827 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:97c59728dc26300675fbd3c8836046faced05044
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:870be3bcd88c267f14fd82da82303472f383cd14
 
 RUN clean-install \
   g++ \
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
index ff7c604f37..427b617af2 100644
--- a/test/e2e-image/Dockerfile
+++ b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v12022019-e864fc719 AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v12182019-870be3bcd AS BASE
 
 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1