From 7201e37633485d1f14dbe9cd7b22dd380df00a07 Mon Sep 17 00:00:00 2001 From: James Strong Date: Sun, 6 Jun 2021 11:32:38 -0400 Subject: [PATCH] Prepare to release v0.47.0 (#7209) * Update base image for e2e tests * updating base image in script as well * prep release for new nginx image --- TAG | 2 +- build/run-in-docker.sh | 2 +- test/e2e-image/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TAG b/TAG index 222a360a3..0131a133c 100644 --- a/TAG +++ b/TAG @@ -1 +1 @@ -v0.46.0 +v0.47.0 diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index e9f76ad99..d6723c7a1 100755 --- a/build/run-in-docker.sh +++ b/build/run-in-docker.sh @@ -34,7 +34,7 @@ function cleanup { } trap cleanup EXIT -E2E_IMAGE=${E2E_IMAGE:-k8s.gcr.io/ingress-nginx/e2e-test-runner:v20210326-gb52c538bb@sha256:b1b684ac3cc6a1ba68611707467fe2c9fe1c9c4a60f85e19ee10ea14b5343432} +E2E_IMAGE=${E2E_IMAGE:-k8s.gcr.io/ingress-nginx/e2e-test-runner:v20210601-g96a87c79b@sha256:f84dcddc84e5cba220260f315e18cd47fc8c6b7f3f4f57b7b3e9cc2ea25324b7} DOCKER_OPTS=${DOCKER_OPTS:-} DOCKER_IN_DOCKER_ENABLED=${DOCKER_IN_DOCKER_ENABLED:-} diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index e46ce9432..8c640d92b 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM k8s.gcr.io/ingress-nginx/e2e-test-runner:v20210326-gb52c538bb@sha256:b1b684ac3cc6a1ba68611707467fe2c9fe1c9c4a60f85e19ee10ea14b5343432 AS BASE +FROM k8s.gcr.io/ingress-nginx/e2e-test-runner:v20210601-g96a87c79b@sha256:f84dcddc84e5cba220260f315e18cd47fc8c6b7f3f4f57b7b3e9cc2ea25324b7 AS BASE FROM alpine:3.12