From c9d069e64d643eb185ab41588f23d26f9b782488 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Sat, 6 Apr 2019 12:30:35 -0300 Subject: [PATCH] Update nginx image to 0.84 (#3969) --- Makefile | 2 +- build/go-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 f03a7d5351..93bd5b710c 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.82 +BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.84 ifeq ($(ARCH),arm64) QEMUARCH=aarch64 diff --git a/build/go-in-docker.sh b/build/go-in-docker.sh index 9c58d750b2..5d3e8d51a2 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:v03262019-b033fbf0b +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04062019-3dc4253b7 DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 8dc5ca9a3c..d9c56276e2 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.83 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.84 RUN clean-install \ g++ \ diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index aa289cca8d..cd676c460e 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v03262019-b033fbf0b AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v04062019-3dc4253b7 AS BASE FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1