From fd9e2b221437538cf0f0a105933f13be7c0e5519 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Mon, 2 Dec 2019 14:36:49 -0300 Subject: [PATCH] Update nginx and e2e images (#4805) --- 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 01ad4b32a..d523080dd 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):d523b4a96eec80324ee04afed74bf8bddcba09cf +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):97c59728dc26300675fbd3c8836046faced05044 ifeq ($(ARCH),arm) QEMUARCH=arm diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 1310f8135..3af436e62 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:v11272019-7e993dda1 +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v12022019-e864fc719 DOCKER_OPTS=${DOCKER_OPTS:-} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index e8476c879..0acdd1fea 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:d523b4a96eec80324ee04afed74bf8bddcba09cf +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:97c59728dc26300675fbd3c8836046faced05044 RUN clean-install \ g++ \ diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index 1ccc65ec8..ff7c604f3 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v11272019-7e993dda1 AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v12022019-e864fc719 AS BASE FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1