DevFW-CICD/ingress-nginx-helm
15
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-01-26 21:48:35 -03:00
parent 68bfbd939b
commit 02c99e9ccf
5 changed files with 10 additions and 6 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:v01142020-3f0df1c35 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01262020-44fb2a873
DOCKER_OPTS=${DOCKER_OPTS:-} DOCKER_OPTS=${DOCKER_OPTS:-}

2
images/e2e/Dockerfile
View file

@ -38,6 +38,7 @@ RUN apk add --no-cache \
gcc \ gcc \
git \ git \
musl-dev \ musl-dev \
perl \
python \ python \
openssl openssl
@ -47,7 +48,6 @@ RUN set -eux; \
pkgconfig \ pkgconfig \
openssl \ openssl \
unzip \ unzip \
perl \
go \ go \
; \ ; \
export \ export \

5
images/e2e/Makefile
View file

@ -23,10 +23,11 @@ docker-build:
docker buildx build \ docker buildx build \
--pull \ --pull \
--load \ --load \
--progress plain \
--build-arg K8S_RELEASE=v1.15.7 \ --build-arg K8S_RELEASE=v1.15.7 \
--build-arg ETCD_VERSION=v3.3.18 \ --build-arg ETCD_VERSION=v3.3.18 \
--build-arg GOLANG_VERSION=1.13.5 \ --build-arg GOLANG_VERSION=1.13.6 \
--build-arg GOLANG_SHA=27d356e2a0b30d9983b60a788cf225da5f914066b37a6b4f69d457ba55a626ff \ --build-arg GOLANG_SHA=aae5be954bdc40bcf8006eb77e8d8a5dde412722bc8effcdaf9772620d06420c \
--build-arg RESTY_CLI_VERSION=0.25rc2 \ --build-arg RESTY_CLI_VERSION=0.25rc2 \
--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \ --build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
-t $(IMAGE):$(TAG) . -t $(IMAGE):$(TAG) .

2
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v01142020-3f0df1c35 AS BASE FROM quay.io/kubernetes-ingress-controller/e2e:v01262020-44fb2a873 AS BASE
FROM alpine:3.11 FROM alpine:3.11

5
test/e2e-image/Makefile
View file

@ -25,7 +25,10 @@ endif
cp -r ../../deploy/cloud-generic . cp -r ../../deploy/cloud-generic .
cp -r ../../deploy/cluster-wide . cp -r ../../deploy/cluster-wide .
docker build -t nginx-ingress-controller:e2e . docker buildx build \
--load \
--progress plain \
--tag nginx-ingress-controller:e2e .
.PHONY: clean .PHONY: clean
clean: clean: