diff --git a/build/images/ingress-controller/build-ingress-controller.sh b/build/images/ingress-controller/build-ingress-controller.sh index 88d64c4d1..00cb6b46c 100644 --- a/build/images/ingress-controller/build-ingress-controller.sh +++ b/build/images/ingress-controller/build-ingress-controller.sh @@ -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 chmod +x /usr/local/bin/gimme -eval "$(gimme 1.14)" +eval "$(gimme 1.14.1)" export GOPATH="/tmp/go" diff --git a/build/images/nginx/build-nginx.sh b/build/images/nginx/build-nginx.sh index 77107fb31..13c43bfa9 100644 --- a/build/images/nginx/build-nginx.sh +++ b/build/images/nginx/build-nginx.sh @@ -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 chmod +x /usr/local/bin/gimme -eval "$(gimme 1.14)" +eval "$(gimme 1.14.1)" git clone https://github.com/kubernetes/ingress-nginx diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 07cd16e20..cda3948a9 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:v03062020-7b6e2dd31 +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v03242020-d8ecfb732 DOCKER_OPTS=${DOCKER_OPTS:-} diff --git a/images/e2e-prow/Dockerfile b/images/e2e-prow/Dockerfile index 719d75f0a..7f7a61877 100644 --- a/images/e2e-prow/Dockerfile +++ b/images/e2e-prow/Dockerfile @@ -62,7 +62,7 @@ RUN curl -sSL https://github.com/kubernetes-sigs/kind/releases/download/${KIND_V && chmod +x /usr/local/bin/kind # install go -ENV GO_VERSION 1.14 +ENV GO_VERSION 1.14.1 ENV GO_TARBALL "go${GO_VERSION}.linux-amd64.tar.gz" RUN wget -q "https://storage.googleapis.com/golang/${GO_TARBALL}" \ && tar xzf "${GO_TARBALL}" -C /usr/local \ diff --git a/images/e2e/Makefile b/images/e2e/Makefile index aec294ab5..38021c25c 100644 --- a/images/e2e/Makefile +++ b/images/e2e/Makefile @@ -26,8 +26,8 @@ docker-build: --progress plain \ --build-arg K8S_RELEASE=v1.15.7 \ --build-arg ETCD_VERSION=v3.3.18 \ - --build-arg GOLANG_VERSION=1.14 \ - --build-arg GOLANG_SHA=6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389 \ + --build-arg GOLANG_VERSION=1.14.1 \ + --build-arg GOLANG_SHA=2ad2572115b0d1b4cb4c138e6b3a31cee6294cb48af75ee86bec3dca04507676 \ --build-arg RESTY_CLI_VERSION=0.25rc2 \ --build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \ --build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \ diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index 3423fad0f..6199da6eb 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -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