diff --git a/Makefile b/Makefile index 9133d23da..a94f0a72d 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ endif REGISTRY ?= quay.io/kubernetes-ingress-controller BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx -BASE_TAG ?= 7b6e2dd312f1808e43fb39992ea814035557c7f3 +BASE_TAG ?= 914aad2ae368dfd0dc56f664bda9da018b1eae92 GOARCH=$(ARCH) GOBUILD_FLAGS := -v diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index cda3948a9..44474b66f 100755 --- a/build/run-in-docker.sh +++ b/build/run-in-docker.sh @@ -34,7 +34,7 @@ function cleanup { } trap cleanup EXIT -E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03242020-d8ecfb732 +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04142020-0257068b9 DOCKER_OPTS=${DOCKER_OPTS:-} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index e7483d903..6b88914a1 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:7b6e2dd312f1808e43fb39992ea814035557c7f3 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:914aad2ae368dfd0dc56f664bda9da018b1eae92 ARG GOLANG_VERSION ARG GOLANG_SHA diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index 6199da6eb..f7b1cc124 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v03242020-d8ecfb732 AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v04142020-0257068b9 AS BASE FROM alpine:3.11