diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 811354c30..ceecb02a3 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:v05312020-2a72fd981 +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v05312020-d250b97b4 DOCKER_OPTS=${DOCKER_OPTS:-} diff --git a/images/e2e-prow/Makefile b/images/e2e-prow/Makefile index d79a52bd2..e7af88f89 100644 --- a/images/e2e-prow/Makefile +++ b/images/e2e-prow/Makefile @@ -5,7 +5,7 @@ IMAGE = $(REGISTRY)/e2e-prow .PHONY: image image: - $(DOCKER) buildx build \ + docker buildx build \ --pull \ --push \ --platform amd64 \ diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile index 1ce254963..03067ec25 100644 --- a/images/e2e/Dockerfile +++ b/images/e2e/Dockerfile @@ -98,6 +98,9 @@ RUN wget -O /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz \ && cp -R /tmp/ct-download/etc/* /etc/ct \ && rm -rf /tmp/* +RUN wget https://raw.githubusercontent.com/openresty/openresty-devel-utils/master/lj-releng -O /usr/local/bin/lj-releng \ + && chmod +x /usr/local/bin/lj-releng + ARG HELM_VERSION RUN wget -O /tmp/helm.tgz https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz \ diff --git a/images/e2e/Makefile b/images/e2e/Makefile index be130b8b1..ffa89279d 100644 --- a/images/e2e/Makefile +++ b/images/e2e/Makefile @@ -22,7 +22,8 @@ PLATFORM ?= amd64 .PHONY: image image: docker buildx build \ - --load \ + --pull \ + --push \ --progress plain \ --platform $(PLATFORM) \ --build-arg K8S_RELEASE=v1.15.7 \ diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index b5ee7dbd2..67bc40a03 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v05312020-2a72fd981 AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v05312020-d250b97b4 AS BASE FROM alpine:3.12