diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 62f5aba62..643f7ef16 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:v20200812-gf6dce060b@sha256:a2b6585d6badd2bbf8805cb1f576e7eb6be8fd1e5ece7c362eaa9610f22786ba} +E2E_IMAGE=${E2E_IMAGE:-k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200902-gf3d80b2c2@sha256:ff2936f75777c436f81181b5da717ea8f82e64ddd0634296ec864389d2e30dca} 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 67b613552..816ce58f4 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200812-gf6dce060b@sha256:a2b6585d6badd2bbf8805cb1f576e7eb6be8fd1e5ece7c362eaa9610f22786ba AS BASE +FROM k8s.gcr.io/ingress-nginx/e2e-test-runner:v20200902-gf3d80b2c2@sha256:ff2936f75777c436f81181b5da717ea8f82e64ddd0634296ec864389d2e30dca AS BASE FROM alpine:3.12 @@ -11,10 +11,10 @@ RUN apk add -U --no-cache \ openssl COPY --from=BASE /go/bin/ginkgo /usr/local/bin/ -COPY --from=BASE /usr/local/bin/kubectl /usr/local/bin/ -COPY --from=BASE /usr/local/bin/cfssl /usr/local/bin/ COPY --from=BASE /usr/local/bin/helm /usr/local/bin/ -COPY --from=BASE /usr/local/bin/cfssljson /usr/local/bin/ +COPY --from=BASE /usr/local/bin/kubectl /usr/local/bin/ +COPY --from=BASE /usr/bin/cfssl /usr/local/bin/ +COPY --from=BASE /usr/bin/cfssljson /usr/local/bin/ COPY . /