diff --git a/Makefile b/Makefile index 0961b4bb1..2fd29ccd7 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ ARCH ?= $(shell go env GOARCH) REGISTRY ?= quay.io/kubernetes-ingress-controller BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx -BASE_TAG ?= c5db20ace43ada5b4c191df24c480fddceb5d482 +BASE_TAG ?= 7b6e2dd312f1808e43fb39992ea814035557c7f3 GOARCH=$(ARCH) GOBUILD_FLAGS := -v diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 671a2497b..a3676e5b1 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:v02262020-a830e931d +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03062020-7b6e2dd31 DOCKER_OPTS=${DOCKER_OPTS:-} diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 6a994ed4b..e7483d903 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:c5db20ace43ada5b4c191df24c480fddceb5d482 +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:7b6e2dd312f1808e43fb39992ea814035557c7f3 ARG GOLANG_VERSION ARG GOLANG_SHA diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index ced013ca7..3423fad0f 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v02262020-a830e931d AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v03062020-7b6e2dd31 AS BASE FROM alpine:3.11