Cleanup docker build (#5083)

kubernetes · Feb 15, 2020 · eed9e0d · eed9e0d
1 parent eedcdcd
commit eed9e0d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/build/images/ingress-controller/build-ingress-controller.sh b/build/images/ingress-controller/build-ingress-controller.sh
@@ -80,19 +80,18 @@ git clone https://github.com/kubernetes/ingress-nginx
 
 cd ingress-nginx
 
-# disable docker in docker tasks
-export DIND_TASKS=0
-
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
 make init-docker-buildx
 docker buildx use ingress-nginx --default --global
 
-echo "Building NGINX image..."
-make all-container
+# disable docker in docker tasks
+export DIND_TASKS=0
 
-echo "Publishing NGINX images..."
-make all-push
+echo "Building NGINX image..."
+ARCH=amd64 make build container push
+ARCH=arm   make build container push
+ARCH=arm64 make build container push
 
 # Requires https://github.com/kubernetes/ingress-nginx/pull/4271
 #echo "Creating multi-arch images..."

diff --git a/images/nginx/38cb695de87cfeadcba5eeaf57f39e41d529aa1f.tar.gz b/images/nginx/38cb695de87cfeadcba5eeaf57f39e41d529aa1f.tar.gz
diff --git a/images/nginx/Makefile b/images/nginx/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # 0.0.0 shouldn't clobber any released builds
-TAG ?= 0.97
+TAG ?= 0.98
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 
 IMGNAME = nginx
@@ -44,11 +44,6 @@ container:
 			--platform $(PLATFORM) \
 			--tag $(IMAGE)-$(PLATFORM):$(TAG) rootfs;)
 
-ifeq ($(ARCH), amd64)
-	# This is for to maintain the backward compatibility
-	docker tag $(MULTI_ARCH_IMG):$(TAG) $(IMAGE):$(TAG)
-endif
-
 .PHONY: push
 push: container
 	$(foreach PLATFORM,$(PLATFORMS), \