DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update e2e image

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-05-31 15:35:55 -04:00
parent 7bd62f5c0a
commit 5f03b07245
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/run-in-docker.sh
View file

@ -34,7 +34,7 @@ function cleanup {
} }
trap cleanup EXIT 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:-} DOCKER_OPTS=${DOCKER_OPTS:-}

2
images/e2e-prow/Makefile
View file

@ -5,7 +5,7 @@ IMAGE = $(REGISTRY)/e2e-prow
.PHONY: image .PHONY: image
image: image:
$(DOCKER) buildx build \ docker buildx build \
--pull \ --pull \
--push \ --push \
--platform amd64 \ --platform amd64 \

3
images/e2e/Dockerfile
View file

@ -98,6 +98,9 @@ RUN wget -O /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz \
&& cp -R /tmp/ct-download/etc/* /etc/ct \ && cp -R /tmp/ct-download/etc/* /etc/ct \
&& rm -rf /tmp/* && 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 ARG HELM_VERSION
RUN wget -O /tmp/helm.tgz https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz \ RUN wget -O /tmp/helm.tgz https://get.helm.sh/helm-${HELM_VERSION}-linux-${TARGETARCH}.tar.gz \

3
images/e2e/Makefile
View file

@ -22,7 +22,8 @@ PLATFORM ?= amd64
.PHONY: image .PHONY: image
image: image:
docker buildx build \ docker buildx build \
--load \ --pull \
--push \
--progress plain \ --progress plain \
--platform $(PLATFORM) \ --platform $(PLATFORM) \
--build-arg K8S_RELEASE=v1.15.7 \ --build-arg K8S_RELEASE=v1.15.7 \

2
test/e2e-image/Dockerfile
View file

@ -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 FROM alpine:3.12