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

Update go and e2e image (#5289)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-03-24 11:42:31 -03:00 committed by GitHub
parent d8ecfb7324
commit 9af24fdf5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/images/ingress-controller/build-ingress-controller.sh
View file

@ -67,7 +67,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
chmod +x /usr/local/bin/gimme chmod +x /usr/local/bin/gimme
eval "$(gimme 1.14)" eval "$(gimme 1.14.1)"
export GOPATH="/tmp/go" export GOPATH="/tmp/go"

2
build/images/nginx/build-nginx.sh
View file

@ -70,7 +70,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
chmod +x /usr/local/bin/gimme chmod +x /usr/local/bin/gimme
eval "$(gimme 1.14)" eval "$(gimme 1.14.1)"
git clone https://github.com/kubernetes/ingress-nginx git clone https://github.com/kubernetes/ingress-nginx

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:v03062020-7b6e2dd31 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03242020-d8ecfb732
DOCKER_OPTS=${DOCKER_OPTS:-} DOCKER_OPTS=${DOCKER_OPTS:-}

2
images/e2e-prow/Dockerfile
View file

@ -62,7 +62,7 @@ RUN curl -sSL https://github.com/kubernetes-sigs/kind/releases/download/${KIND_V
&& chmod +x /usr/local/bin/kind && chmod +x /usr/local/bin/kind
# install go # install go
ENV GO_VERSION 1.14 ENV GO_VERSION 1.14.1
ENV GO_TARBALL "go${GO_VERSION}.linux-amd64.tar.gz" ENV GO_TARBALL "go${GO_VERSION}.linux-amd64.tar.gz"
RUN wget -q "https://storage.googleapis.com/golang/${GO_TARBALL}" \ RUN wget -q "https://storage.googleapis.com/golang/${GO_TARBALL}" \
&& tar xzf "${GO_TARBALL}" -C /usr/local \ && tar xzf "${GO_TARBALL}" -C /usr/local \

4
images/e2e/Makefile
View file

@ -26,8 +26,8 @@ docker-build:
--progress plain \ --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.14 \ --build-arg GOLANG_VERSION=1.14.1 \
--build-arg GOLANG_SHA=6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389 \ --build-arg GOLANG_SHA=2ad2572115b0d1b4cb4c138e6b3a31cee6294cb48af75ee86bec3dca04507676 \
--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 \
--build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \ --build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \

2
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v03062020-7b6e2dd31 AS BASE FROM quay.io/kubernetes-ingress-controller/e2e:v03242020-d8ecfb732 AS BASE
FROM alpine:3.11 FROM alpine:3.11