Merge pull request kubernetes#4528 from aledbf/clean-docker

Cleanup of docker images
headcr4sh · Sep 4, 2019 · 74031cc · 74031cc
2 parents 9c51676 + dc20551
commit 74031cc
Show file tree

Hide file tree

Showing 20 changed files with 48 additions and 45 deletions.
diff --git a/Makefile b/Makefile
@@ -50,7 +50,7 @@ GOBUILD_FLAGS := -v
 
 ALL_ARCH = amd64 arm arm64
 
-QEMUVERSION = v4.0.0
+QEMUVERSION = v4.1.0-1
 
 BUSTED_ARGS =-v --pattern=_test
 
@@ -212,12 +212,12 @@ dev-env:
 
 .PHONY: live-docs
 live-docs:
-	@docker build --pull -t ingress-nginx/mkdocs build/mkdocs
+	@docker build --pull -t ingress-nginx/mkdocs images/mkdocs
 	@docker run --rm -it -p 3000:3000 -v ${PWD}:/docs ingress-nginx/mkdocs
 
 .PHONY: build-docs
 build-docs:
-	@docker build --pull -t ingress-nginx/mkdocs build/mkdocs
+	@docker build --pull -t ingress-nginx/mkdocs images/mkdocs
 	@docker run --rm -v ${PWD}:/docs ingress-nginx/mkdocs build
 
 .PHONY: misspell

diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
@@ -30,7 +30,7 @@ function cleanup {
 }
 trap cleanup EXIT
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v06262019-ecce3fd7b
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v09032019-b807fb5d2
 
 DOCKER_OPTS=${DOCKER_OPTS:-}
 

diff --git a/docs/examples/customization/external-auth-headers/authsvc/Dockerfile b/docs/examples/customization/external-auth-headers/authsvc/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.10
 MAINTAINER Roman Safronov <[email protected]>
 COPY authsvc /
 EXPOSE 8080

diff --git a/docs/examples/customization/external-auth-headers/echosvc/Dockerfile b/docs/examples/customization/external-auth-headers/echosvc/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.10
 MAINTAINER Roman Safronov <[email protected]>
 COPY echosvc /
 EXPOSE 8080

diff --git a/images/404-server/README.md b/images/404-server/README.md
diff --git a/images/OWNERS b/images/OWNERS
@@ -1,5 +1,7 @@
 approvers:
 - aledbf
+- ElvinEfendi
+
 reviewers:
-- bprashanth
+- ElvinEfendi
 - aledbf
diff --git a/images/README.md b/images/README.md
@@ -0,0 +1,14 @@
+# Docker images
+
+Directory | Purpose
+------------ | -------------
+custom-error-pages | Example of Custom error pages for the NGINX Ingress controller
+e2e | Image to run e2e tests
+e2e-prow | Image to launch Prow jobs
+fastcgi-helloserver | FastCGI application for e2e tests
+grpc-fortune-teller | grpc server application for the nginx-ingress grpc example
+httpbin | A simple HTTP Request & Response Service
+mkdocs | Image to build the static documentation
+nginx | OpenResty base image using [debian-base](https://quay.io/kubernetes-ingress-controller/debian-base-amd64)
+
+:bangbang: Only the nginx image is meant to be published. The others are used as examples for some feature of the ingress controller or to run e2e tests.
diff --git a/images/custom-error-pages/Makefile b/images/custom-error-pages/Makefile
@@ -25,11 +25,11 @@ endif
 ARCH ?= $(shell go env GOARCH)
 GOARCH = ${ARCH}
 
-BASEIMAGE?=alpine:3.9
+BASEIMAGE?=alpine:3.10
 
-ALL_ARCH = amd64 arm arm64 ppc64le
+ALL_ARCH = amd64 arm arm64
 
-QEMUVERSION=v3.0.0
+QEMUVERSION=v4.1.0-1
 
 IMGNAME = custom-error-pages
 IMAGE = $(REGISTRY)/$(IMGNAME)
@@ -40,11 +40,7 @@ ifeq ($(ARCH),arm)
 	GOARCH=arm
 endif
 ifeq ($(ARCH),arm64)
-        QEMUARCH=aarch64
-endif
-ifeq ($(ARCH),ppc64le)
-	QEMUARCH=ppc64le
-	GOARCH=ppc64le
+	QEMUARCH=aarch64
 endif
 
 TEMP_DIR := $(shell mktemp -d)

diff --git a/test/e2e-prow/Dockerfile → images/e2e-prow/Dockerfile b/test/e2e-prow/Dockerfile → images/e2e-prow/Dockerfile
@@ -43,6 +43,7 @@ RUN apt-get update \
 
 ARG K8S_RELEASE
 ARG ETCD_VERSION
+ARG KIND_VERSION
 
 RUN curl -sSL https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
     && chmod +x /usr/local/bin/kubectl
@@ -56,11 +57,11 @@ RUN curl -sSL https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VE
     && cp /tmp/etcd-download/etcd /usr/local/bin \
     && rm -rf /tmp/etcd-download
 
-RUN curl -sSL https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64 -o /usr/local/bin/kind \
+RUN curl -sSL https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64 -o /usr/local/bin/kind \
     && chmod +x /usr/local/bin/kind
 
 # install go
-ENV GO_VERSION 1.12.6
+ENV GO_VERSION 1.13
 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/test/e2e-prow/Makefile → images/e2e-prow/Makefile b/test/e2e-prow/Makefile → images/e2e-prow/Makefile
@@ -9,8 +9,9 @@ all: docker-build docker-push
 docker-build:
 	$(DOCKER) build \
 		--pull \
-		--build-arg K8S_RELEASE=v1.15.0 \
-		--build-arg ETCD_VERSION=v3.3.12 \
+		--build-arg K8S_RELEASE=v1.15.3 \
+		--build-arg ETCD_VERSION=v3.3.15 \
+		--build-arg KIND_VERSION=v0.5.1 \
 		-t $(IMAGE):$(TAG) .
 
 docker-push:

diff --git 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:0.90
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.91
 
 RUN clean-install \
   g++ \
@@ -24,9 +24,9 @@ RUN clean-install \
   python \
   pkg-config
 
-ENV GOLANG_VERSION 1.12.6
+ENV GOLANG_VERSION 1.13
 ENV GO_ARCH        linux-amd64
-ENV GOLANG_SHA     dbcf71a3c1ea53b8d54ef1b48c85a39a6c9a935d01fc8291ff2b92028e59913c
+ENV GOLANG_SHA     68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856
 
 RUN set -eux; \
   url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \
@@ -44,8 +44,8 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 
 WORKDIR $GOPATH
 
-ENV RESTY_CLI_VERSION 0.23
-ENV RESTY_CLI_SHA     8715b9a6e33140fd468779cd561c0c622f7444a902dc578b1137941ff3fc1ed8
+ENV RESTY_CLI_VERSION 0.25rc2
+ENV RESTY_CLI_SHA     a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb
 
 RUN set -eux; \
   url="https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz"; \

diff --git a/images/e2e/Makefile b/images/e2e/Makefile
@@ -23,8 +23,8 @@ all: docker-build docker-push
 docker-build:
 	$(DOCKER) build \
 		--pull \
-		--build-arg K8S_RELEASE=v1.15.0 \
-		--build-arg ETCD_VERSION=v3.3.12 \
+		--build-arg K8S_RELEASE=v1.15.3 \
+		--build-arg ETCD_VERSION=v3.3.15 \
 		-t $(IMAGE):$(TAG) .
 
 docker-push:

diff --git a/images/fastcgi-helloserver/Makefile b/images/fastcgi-helloserver/Makefile
@@ -21,11 +21,11 @@ REPO_INFO=$(shell git config --get remote.origin.url)
 ARCH ?= $(shell go env GOARCH)
 GOARCH = ${ARCH}
 
-BASEIMAGE?=alpine:3.9
+BASEIMAGE?=alpine:3.10
 
-ALL_ARCH = amd64 arm arm64 ppc64le
+ALL_ARCH = amd64 arm arm64
 
-QEMUVERSION=v3.0.0
+QEMUVERSION=v4.1.0-1
 
 IMGNAME = fastcgi-helloserver
 IMAGE = $(REGISTRY)/$(IMGNAME)
@@ -36,11 +36,7 @@ ifeq ($(ARCH),arm)
 	GOARCH=arm
 endif
 ifeq ($(ARCH),arm64)
-        QEMUARCH=aarch64
-endif
-ifeq ($(ARCH),ppc64le)
-	QEMUARCH=ppc64le
-	GOARCH=ppc64le
+	QEMUARCH=aarch64
 endif
 
 TEMP_DIR := $(shell mktemp -d)

diff --git a/images/httpbin/Makefile b/images/httpbin/Makefile
@@ -24,7 +24,7 @@ BASEIMAGE?=quay.io/kubernetes-ingress-controller/debian-base-$(ARCH):0.1
 
 ALL_ARCH = amd64 arm arm64
 
-QEMUVERSION=v4.0.0
+QEMUVERSION=v4.1.0-1
 
 IMGNAME = httpbin
 IMAGE = $(REGISTRY)/$(IMGNAME)
@@ -36,9 +36,6 @@ endif
 ifeq ($(ARCH),arm64)
 	QEMUARCH=aarch64
 endif
-ifeq ($(ARCH),ppc64le)
-	QEMUARCH=ppc64le
-endif
 
 TEMP_DIR := $(shell mktemp -d)
 

diff --git a/build/mkdocs/Dockerfile → images/mkdocs/Dockerfile b/build/mkdocs/Dockerfile → images/mkdocs/Dockerfile
diff --git a/build/mkdocs/entrypoint.sh → images/mkdocs/entrypoint.sh b/build/mkdocs/entrypoint.sh → images/mkdocs/entrypoint.sh
diff --git a/images/nginx/Makefile b/images/nginx/Makefile
@@ -26,7 +26,7 @@ ifeq ($(GOHOSTOS),darwin)
   SED_I=sed -i ''
 endif
 
-QEMUVERSION=v4.0.0-2
+QEMUVERSION=v4.1.0-1
 
 IMGNAME = nginx
 IMAGE = $(REGISTRY)/$(IMGNAME)

diff --git a/images/ubuntu-slim/README.md b/images/ubuntu-slim/README.md
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v06262019-ecce3fd7b AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v09032019-b807fb5d2 AS BASE
 
 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
 

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -23,6 +23,7 @@ import (
 )
 
 func init() {
+	testing.Init()
 	framework.RegisterParseFlags()
 
 	//	if "" == framework.TestContext.KubeConfig {