From 5d011db7b30beb1b5615261e327013b0c4b8110c Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Tue, 28 Apr 2020 19:42:11 -0400 Subject: [PATCH] Add support for multi-arch images --- Makefile | 8 ++++++++ .../images/ingress-controller/build-ingress-controller.sh | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9e63397a6..c8a8aaaa0 100644 --- a/Makefile +++ b/Makefile @@ -124,6 +124,14 @@ push: .push-$(ARCH) ## Publish image for a particular arch. .push-$(ARCH): docker push $(REGISTRY)/nginx-ingress-controller-${ARCH}:$(TAG) +.PHONY: push-manifest +push-manifest: + docker manifest create $(REGISTRY)/nginx-ingress-controller:$(TAG) \ + $(REGISTRY)/nginx-ingress-controller-amd64:$(TAG) \ + $(REGISTRY)/nginx-ingress-controller-arm:$(TAG) \ + $(REGISTRY)/nginx-ingress-controller-arm64:$(TAG) + docker manifest push --purge $(REGISTRY)/nginx-ingress-controller:$(TAG) + .PHONY: build build: check-go-version ## Build ingress controller, debug tool and pre-stop hook. ifeq ($(USE_DOCKER), true) diff --git a/build/images/ingress-controller/build-ingress-controller.sh b/build/images/ingress-controller/build-ingress-controller.sh index dbc18fac0..8bb5f0d85 100644 --- a/build/images/ingress-controller/build-ingress-controller.sh +++ b/build/images/ingress-controller/build-ingress-controller.sh @@ -93,6 +93,5 @@ 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..." -#make push-manifest +echo "Creating multi-arch images..." +make push-manifest