diff --git a/build/images/ingress-controller/build-ingress-controller.sh b/build/images/ingress-controller/build-ingress-controller.sh index 31928c299..8efb6f1cd 100644 --- 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 deleted file mode 100644 index b1e05c55b..000000000 Binary files a/images/nginx/38cb695de87cfeadcba5eeaf57f39e41d529aa1f.tar.gz and /dev/null differ diff --git a/images/nginx/Makefile b/images/nginx/Makefile index da8deb47a..e237a634e 100644 --- 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), \