Refactor build of docker images

2020-06-01 21:22:32 -04:00 · 2020-06-01 21:22:32 -04:00 · ea8e711d2c
commit ea8e711d2c
parent 8e2eebb197
21 changed files with 89 additions and 183 deletions
--- a/images/cfssl/Makefile
+++ b/images/cfssl/Makefile
@ -17,27 +17,12 @@
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
 TAG ?= 0.0

-HOSTARCH := $(shell uname -m | sed -e s/x86_64/amd64/ \
-	-e s/s390x/s390x/ \
-	-e s/armv7l/arm/ \
-	-e s/aarch64.*/arm64/)
-
-ifndef ARCH
-ARCH := $(HOSTARCH)
-endif
-ifeq ($(ARCH),)
-    $(error mandatory variable ARCH is empty)
-endif
-
 REGISTRY ?= ingress-controller

 IMAGE = $(REGISTRY)/cfssl

 image:
-	docker buildx build \
-		--load \
-		--progress plain \
-		--platform $(ARCH) \
+	docker build \
 		-t $(IMAGE):$(TAG) rootfs

 clean:
--- a/images/e2e-prow/Makefile
+++ b/images/e2e-prow/Makefile
@ -1,3 +1,17 @@
+# Copyright 2018 The Kubernetes Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 TAG ?=v$(shell date +%m%d%Y)-$(shell git rev-parse --short HEAD)
 REGISTRY ?= quay.io/kubernetes-ingress-controller

@ -5,13 +19,8 @@ IMAGE = $(REGISTRY)/e2e-prow

 .PHONY: image
 image:
-	docker buildx build \
-		--pull \
-		--push \
-		--progress plain \
-		--platform amd64 \
+	docker build \
 		--build-arg K8S_RELEASE=v1.17.0 \
-		--build-arg ETCD_VERSION=v3.3.18 \
 		--build-arg KIND_VERSION=v0.8.0 \
 		--build-arg GO_VERSION=1.14.2 \
-		-t $(IMAGE):$(TAG) .
+		-t $(IMAGE):$(TAG) rootfs
--- a/images/e2e-prow/rootfs/Dockerfile
+++ b/images/e2e-prow/rootfs/Dockerfile
@ -16,6 +16,9 @@
 # unit and integration tests

 FROM gcr.io/k8s-testimages/bootstrap
+FROM k8s.gcr.io/etcd:3.4.3-0 as etcd
+
+COPY --from=etcd /usr/local/bin/etcd /usr/local/bin/etcd

 # hint to kubetest that it is in CI
 ENV KUBETEST_IN_DOCKER="true"
@ -43,7 +46,6 @@ RUN apt-get update \
    && rm -rf /var/lib/apt/lists/*

 ARG K8S_RELEASE
-ARG ETCD_VERSION
 ARG KIND_VERSION
 ARG GO_VERSION

@ -53,12 +55,6 @@ RUN curl -sSL https://storage.googleapis.com/kubernetes-release/release/${K8S_RE
 RUN curl -sSL https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kube-apiserver -o /usr/local/bin/kube-apiserver \
    && chmod +x /usr/local/bin/kube-apiserver

-RUN curl -sSL https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
-    && mkdir -p /tmp/etcd-download \
-    && tar xzvf /tmp/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -C /tmp/etcd-download --strip-components=1 \
-    && cp /tmp/etcd-download/etcd /usr/local/bin \
-    && rm -rf /tmp/etcd-download
-
 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

--- a/images/e2e/Makefile
+++ b/images/e2e/Makefile
@ -17,25 +17,18 @@ REGISTRY ?= quay.io/kubernetes-ingress-controller

 IMAGE = $(REGISTRY)/e2e

-PLATFORM ?= amd64
-
 .PHONY: image
 image:
-	docker buildx build \
-		--pull \
-		--push \
-		--progress plain \
-		--platform $(PLATFORM) \
+	docker build \
 		--build-arg K8S_RELEASE=v1.15.7 \
-		--build-arg ETCD_VERSION=v3.3.18 \
 		--build-arg RESTY_CLI_VERSION=0.25rc2 \
 		--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
 		--build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \
 		--build-arg YAML_LINT_VERSION=1.13.0 \
 		--build-arg YAMALE_VERSION=1.8.0 \
-		--build-arg LUA_CHECK_VERSION=0.23.0 \
-		--build-arg LUA_CHECK_SHA=b4edf3a7702519502696d4ac7372ed1bd6a82ded63bf81f2b1d7e9b37711be2b \
-		--build-arg BUSTED_VERSION=v2.0.rc13-0 \
-		--build-arg BUSTED_SHA=74ef88ae04545d78b4922e459c1cd459fb5a0356b73a061549d2e4601b5de254 \
 		--build-arg HELM_VERSION=v3.2.0 \
-		-t $(IMAGE):$(TAG) .
+		-t $(IMAGE):$(TAG) rootfs
+
+.PHONY: show-image
+show-image:
+	echo -n $(IMAGE):$(TAG)
--- a/images/e2e/rootfs/Dockerfile
+++ b/images/e2e/rootfs/Dockerfile
@ -13,6 +13,7 @@
 # limitations under the License.

 FROM golang:1.14.3-alpine3.11 as GO
+FROM k8s.gcr.io/etcd:3.4.3-0 as etcd

 FROM quay.io/kubernetes-ingress-controller/nginx:e3c49c52f4b74fe47ad65d6f3266a02e8b6b622f

@ -25,7 +26,8 @@ ARG CHART_TESTING_VERSION

 RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf

-COPY --from=GO /usr/local/go /usr/local/go
+COPY --from=GO   /usr/local/go /usr/local/go
+COPY --from=etcd /usr/local/bin/etcd /usr/local/bin/etcd

 RUN apk add --no-cache \
  bash \
@ -56,16 +58,13 @@ RUN wget -O /tmp/resty_cli.tgz https://github.com/openresty/resty-cli/archive/v$
  && resty -V \
  && rm -rf /tmp/*

-ARG LUA_CHECK_VERSION
-ARG LUA_CHECK_SHA
-
 RUN wget -O /tmp/luarocks.tgz https://github.com/luarocks/luarocks/archive/v3.3.1.tar.gz \
  && tar -C /tmp -xzf /tmp/luarocks.tgz \
  && cd /tmp/luarocks* \
  && ./configure \
  && make install

-RUN luarocks install busted \
+RUN  luarocks install busted \
  && luarocks install luacheck

 ARG BUSTED_VERSION
@ -81,13 +80,6 @@ RUN wget -O /usr/local/bin/kube-apiserver \
  https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/${TARGETARCH}/kube-apiserver \
  && chmod +x /usr/local/bin/kube-apiserver

-RUN wget -O /tmp/etcd-${ETCD_VERSION}-linux-${TARGETARCH}.tar.gz \
-  https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-${TARGETARCH}.tar.gz \
-  && mkdir -p /tmp/etcd-download \
-  && tar xzvf /tmp/etcd-${ETCD_VERSION}-linux-${TARGETARCH}.tar.gz -C /tmp/etcd-download --strip-components=1 \
-  && cp /tmp/etcd-download/etcd /usr/local/bin \
-  && rm -rf /tmp/*
-
 RUN wget -O /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz \
  https://github.com/helm/chart-testing/releases/download/v${CHART_TESTING_VERSION}/chart-testing_${CHART_TESTING_VERSION}_linux_amd64.tar.gz \
  && mkdir -p /tmp/ct-download \
--- a/images/echo/Makefile
+++ b/images/echo/Makefile
@ -17,28 +17,13 @@
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
 TAG ?= 0.0

-HOSTARCH := $(shell uname -m | sed -e s/x86_64/amd64/ \
-	-e s/s390x/s390x/ \
-	-e s/armv7l/arm/ \
-	-e s/aarch64.*/arm64/)
-
-ifndef ARCH
-ARCH := $(HOSTARCH)
-endif
-ifeq ($(ARCH),)
-    $(error mandatory variable ARCH is empty)
-endif
-
 REGISTRY ?= ingress-controller

 IMAGE = $(REGISTRY)/echo

 image:
-	docker buildx build \
-		--load \
-		--progress plain \
-		--platform $(ARCH) \
-		-t $(IMAGE):$(TAG) .
+	docker build \
+		-t $(IMAGE):$(TAG) rootfs

 clean:
 	docker rmi -f $(IMAGE):$(TAG) || true
--- a/images/echo/rootfs/Dockerfile
+++ b/images/echo/rootfs/Dockerfile
--- a/images/echo/rootfs/nginx.conf
+++ b/images/echo/rootfs/nginx.conf
--- a/images/fastcgi-helloserver/Makefile
+++ b/images/fastcgi-helloserver/Makefile
@ -37,10 +37,7 @@ PKG=k8s.io/ingress-nginx/images/fastcgi-helloserver

 .PHONY: image
 image: build
-	docker buildx build \
-		--load \
-		--progress plain \
-		--platform $(ARCH) \
+	docker build \
 		-t $(IMAGE):$(TAG) rootfs

 .PHONY: build
--- a/images/httpbin/Makefile
+++ b/images/httpbin/Makefile
@ -17,26 +17,11 @@
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
 TAG ?= 0.0

-HOSTARCH := $(shell uname -m | sed -e s/x86_64/amd64/ \
-	-e s/s390x/s390x/ \
-	-e s/armv7l/arm/ \
-	-e s/aarch64.*/arm64/)
-
-ifndef ARCH
-ARCH := $(HOSTARCH)
-endif
-ifeq ($(ARCH),)
-    $(error mandatory variable ARCH is empty)
-endif
-
 REGISTRY ?= ingress-controller

 IMAGE = $(REGISTRY)/httpbin

 .PHONY: image
 image:
-	docker buildx build \
-		--load \
-		--progress plain \
-		--platform $(ARCH) \
+	docker build \
 		-t $(IMAGE):$(TAG) rootfs