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

Merge pull request #4528 from aledbf/clean-docker

Browse source 
Cleanup of docker images
This commit is contained in:
Kubernetes Prow Robot 2019-09-03 18:04:58 -07:00 committed by GitHub
commit 74031cc8b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 48 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -50,7 +50,7 @@ GOBUILD_FLAGS := -v
ALL_ARCH = amd64 arm arm64 ALL_ARCH = amd64 arm arm64
QEMUVERSION = v4.0.0 QEMUVERSION = v4.1.0-1
BUSTED_ARGS =-v --pattern=_test BUSTED_ARGS =-v --pattern=_test
@ -212,12 +212,12 @@ dev-env:
.PHONY: live-docs .PHONY: live-docs
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 @docker run --rm -it -p 3000:3000 -v ${PWD}:/docs ingress-nginx/mkdocs
.PHONY: build-docs .PHONY: build-docs
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 @docker run --rm -v ${PWD}:/docs ingress-nginx/mkdocs build
.PHONY: misspell .PHONY: misspell

2
build/run-in-docker.sh
View file

@ -30,7 +30,7 @@ function cleanup {
} }
trap cleanup EXIT 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:-} DOCKER_OPTS=${DOCKER_OPTS:-}

2
docs/examples/customization/external-auth-headers/authsvc/Dockerfile
View file

@ -1,4 +1,4 @@
FROM alpine:3.5 FROM alpine:3.10
MAINTAINER Roman Safronov <electroma@gmail.com> MAINTAINER Roman Safronov <electroma@gmail.com>
COPY authsvc / COPY authsvc /
EXPOSE 8080 EXPOSE 8080

2
docs/examples/customization/external-auth-headers/echosvc/Dockerfile
View file

@ -1,4 +1,4 @@
FROM alpine:3.5 FROM alpine:3.10
MAINTAINER Roman Safronov <electroma@gmail.com> MAINTAINER Roman Safronov <electroma@gmail.com>
COPY echosvc / COPY echosvc /
EXPOSE 8080 EXPOSE 8080

2
images/404-server/README.md
View file

@ -1,2 +0,0 @@
The 404-server (defaultbackend) has moved to the
[kubernetes/ingress-gce](https://github.com/kubernetes/ingress-gce) repository.

4
images/OWNERS
View file

@ -1,5 +1,7 @@
approvers: approvers:
- aledbf - aledbf
- ElvinEfendi
reviewers: reviewers:
- bprashanth - ElvinEfendi
- aledbf - aledbf

14
images/README.md Normal file
View file

@ -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.

12
images/custom-error-pages/Makefile
View file

@ -25,11 +25,11 @@ endif
ARCH ?= $(shell go env GOARCH) ARCH ?= $(shell go env GOARCH)
GOARCH = ${ARCH} 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 IMGNAME = custom-error-pages
IMAGE = $(REGISTRY)/$(IMGNAME) IMAGE = $(REGISTRY)/$(IMGNAME)
@ -40,11 +40,7 @@ ifeq ($(ARCH),arm)
GOARCH=arm GOARCH=arm
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
QEMUARCH=aarch64 QEMUARCH=aarch64
endif
ifeq ($(ARCH),ppc64le)
QEMUARCH=ppc64le
GOARCH=ppc64le
endif endif
TEMP_DIR := $(shell mktemp -d) TEMP_DIR := $(shell mktemp -d)

5
test/e2e-prow/Dockerfile → images/e2e-prow/Dockerfile
View file

@ -43,6 +43,7 @@ RUN apt-get update \
ARG K8S_RELEASE ARG K8S_RELEASE
ARG ETCD_VERSION 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 \ 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 && 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 \ && cp /tmp/etcd-download/etcd /usr/local/bin \
&& rm -rf /tmp/etcd-download && 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 && chmod +x /usr/local/bin/kind
# install go # install go
ENV GO_VERSION 1.12.6 ENV GO_VERSION 1.13
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 \

5
test/e2e-prow/Makefile → images/e2e-prow/Makefile
View file

@ -9,8 +9,9 @@ all: docker-build docker-push
docker-build: docker-build:
$(DOCKER) build \ $(DOCKER) build \
--pull \ --pull \
--build-arg K8S_RELEASE=v1.15.0 \ --build-arg K8S_RELEASE=v1.15.3 \
--build-arg ETCD_VERSION=v3.3.12 \ --build-arg ETCD_VERSION=v3.3.15 \
--build-arg KIND_VERSION=v0.5.1 \
-t $(IMAGE):$(TAG) . -t $(IMAGE):$(TAG) .
docker-push: docker-push:

10
images/e2e/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 \ RUN clean-install \
g++ \ g++ \
@ -24,9 +24,9 @@ RUN clean-install \
python \ python \
pkg-config pkg-config
ENV GOLANG_VERSION 1.12.6 ENV GOLANG_VERSION 1.13
ENV GO_ARCH linux-amd64 ENV GO_ARCH linux-amd64
ENV GOLANG_SHA dbcf71a3c1ea53b8d54ef1b48c85a39a6c9a935d01fc8291ff2b92028e59913c ENV GOLANG_SHA 68a2297eb099d1a76097905a2ce334e3155004ec08cdea85f24527be3c48e856
RUN set -eux; \ RUN set -eux; \
url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \ 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 WORKDIR $GOPATH
ENV RESTY_CLI_VERSION 0.23 ENV RESTY_CLI_VERSION 0.25rc2
ENV RESTY_CLI_SHA 8715b9a6e33140fd468779cd561c0c622f7444a902dc578b1137941ff3fc1ed8 ENV RESTY_CLI_SHA a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb
RUN set -eux; \ RUN set -eux; \
url="https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz"; \ url="https://github.com/openresty/resty-cli/archive/v${RESTY_CLI_VERSION}.tar.gz"; \

4
images/e2e/Makefile
View file

@ -23,8 +23,8 @@ all: docker-build docker-push
docker-build: docker-build:
$(DOCKER) build \ $(DOCKER) build \
--pull \ --pull \
--build-arg K8S_RELEASE=v1.15.0 \ --build-arg K8S_RELEASE=v1.15.3 \
--build-arg ETCD_VERSION=v3.3.12 \ --build-arg ETCD_VERSION=v3.3.15 \
-t $(IMAGE):$(TAG) . -t $(IMAGE):$(TAG) .
docker-push: docker-push:

12
images/fastcgi-helloserver/Makefile
View file

@ -21,11 +21,11 @@ REPO_INFO=$(shell git config --get remote.origin.url)
ARCH ?= $(shell go env GOARCH) ARCH ?= $(shell go env GOARCH)
GOARCH = ${ARCH} 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 IMGNAME = fastcgi-helloserver
IMAGE = $(REGISTRY)/$(IMGNAME) IMAGE = $(REGISTRY)/$(IMGNAME)
@ -36,11 +36,7 @@ ifeq ($(ARCH),arm)
GOARCH=arm GOARCH=arm
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
QEMUARCH=aarch64 QEMUARCH=aarch64
endif
ifeq ($(ARCH),ppc64le)
QEMUARCH=ppc64le
GOARCH=ppc64le
endif endif
TEMP_DIR := $(shell mktemp -d) TEMP_DIR := $(shell mktemp -d)

5
images/httpbin/Makefile
View file

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

0
build/mkdocs/Dockerfile → images/mkdocs/Dockerfile
View file

0
build/mkdocs/entrypoint.sh → images/mkdocs/entrypoint.sh
View file

2
images/nginx/Makefile
View file

@ -26,7 +26,7 @@ ifeq ($(GOHOSTOS),darwin)
SED_I=sed -i '' SED_I=sed -i ''
endif endif
QEMUVERSION=v4.0.0-2 QEMUVERSION=v4.1.0-1
IMGNAME = nginx IMGNAME = nginx
IMAGE = $(REGISTRY)/$(IMGNAME) IMAGE = $(REGISTRY)/$(IMGNAME)

3
images/ubuntu-slim/README.md
View file

@ -1,3 +0,0 @@
# Deprecated
Please switch to [debian-base](https://github.com/kubernetes/kubernetes/tree/master/build/debian-base)

2
test/e2e-image/Dockerfile
View file

@ -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 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1

1
test/e2e/e2e_test.go
View file

@ -23,6 +23,7 @@ import (
) )
func init() { func init() {
testing.Init()
framework.RegisterParseFlags() framework.RegisterParseFlags()
// if "" == framework.TestContext.KubeConfig { // if "" == framework.TestContext.KubeConfig {