diff --git a/Makefile b/Makefile index e93122f0c..c4f2443d1 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ ARCH ?= $(shell go env GOARCH) REGISTRY ?= quay.io/kubernetes-ingress-controller BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx -BASE_TAG ?= 6ab10fa68ddea57fa51b37284b2678ac073ae74b +BASE_TAG ?= c5db20ace43ada5b4c191df24c480fddceb5d482 GOARCH=$(ARCH) GOBUILD_FLAGS := -v diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 610657a7a..c06a996d3 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:v02132020-0e2ca1cc0 +E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02212020-07686f894 DOCKER_OPTS=${DOCKER_OPTS:-} diff --git a/images/e2e-prow/Dockerfile b/images/e2e-prow/Dockerfile index 921e9c4d6..ca1d54b24 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.13 +ENV GO_VERSION 1.13.8 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/Dockerfile b/images/e2e/Dockerfile index bf46e02e5..cc66a1c02 100644 --- a/images/e2e/Dockerfile +++ b/images/e2e/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM quay.io/kubernetes-ingress-controller/nginx-amd64:6ab10fa68ddea57fa51b37284b2678ac073ae74b +FROM quay.io/kubernetes-ingress-controller/nginx-amd64:c5db20ace43ada5b4c191df24c480fddceb5d482 ARG GOLANG_VERSION ARG GOLANG_SHA diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index 202a0f5bd..10dfed3dc 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v02132020-0e2ca1cc0 AS BASE +FROM quay.io/kubernetes-ingress-controller/e2e:v02212020-07686f894 AS BASE FROM alpine:3.11