Merge latest master

Makefile

@@ -1,13 +1,18 @@
 # note: call scripts from /scripts
 
-.PHONY: default build builder-image binary-image test stop clean-images clean push apply deploy
+.PHONY: default build builder-image binary-image test stop clean-images clean push apply deploy release release-all manifest push clean-image
 
-BUILDER ?= reloader-builder
+OS ?= linux
+ARCH ?= ???
+ALL_ARCH ?= arm64 arm amd64
+
+BUILDER ?= reloader-builder-${ARCH}
 BINARY ?= Reloader
 DOCKER_IMAGE ?= stakater/reloader
 # Default value "dev"
-DOCKER_TAG ?= 1.0.0
-REPOSITORY = ${DOCKER_IMAGE}:${DOCKER_TAG}
+TAG ?= v0.0.75.0
+REPOSITORY_GENERIC = ${DOCKER_IMAGE}:${TAG}
+REPOSITORY_ARCH = ${DOCKER_IMAGE}:${TAG}-${ARCH}
 
 VERSION=$(shell cat .version)
 BUILD=
@@ -25,10 +30,35 @@ build:
 	"$(GOCMD)" build ${GOFLAGS} ${LDFLAGS} -o "${BINARY}"
 
 builder-image:
-	@docker build --network host -t "${BUILDER}" -f build/package/Dockerfile.build .
+	docker buildx build --platform ${OS}/${ARCH} --build-arg GOARCH=$(ARCH) -t "${BUILDER}" --load -f build/package/Dockerfile.build .
+
+reloader-${ARCH}.tar:
+	docker buildx build --platform ${OS}/${ARCH} --build-arg GOARCH=$(ARCH) -t "${BUILDER}" --load -f build/package/Dockerfile.build .
+	docker run --platform ${OS}/${ARCH} --rm "${BUILDER}" > reloader-${ARCH}.tar
 
 binary-image: builder-image
-	@docker run --network host --rm "${BUILDER}" | docker build --network host -t "${REPOSITORY}" -f Dockerfile.run -
+	cat reloader-${ARCH}.tar | docker buildx build --platform ${OS}/${ARCH} -t "${REPOSITORY_ARCH}"  --load -f Dockerfile.run -
+
+push:
+	docker push ${REPOSITORY_ARCH}
+
+release:  binary-image push manifest
+
+release-all:
+	-rm -rf ~/.docker/manifests/*
+	# Make arch-specific release
+	@for arch in $(ALL_ARCH) ; do \
+		echo Make release: $$arch ; \
+		make release ARCH=$$arch ; \
+	done
+
+	set -e
+	docker manifest push --purge $(REPOSITORY_GENERIC)
+
+manifest:
+	set -e
+	docker manifest create -a $(REPOSITORY_GENERIC) $(REPOSITORY_ARCH)
+	docker manifest annotate --arch $(ARCH) $(REPOSITORY_GENERIC)  $(REPOSITORY_ARCH)
 
 test:
 	"$(GOCMD)" test -timeout 1800s -v ./...
@@ -37,13 +67,21 @@ stop:
 	@docker stop "${BINARY}"
 
 clean-images: stop
-	@docker rmi "${BUILDER}" "${BINARY}"
+	-docker rmi "${BINARY}"
+	@for arch in $(ALL_ARCH) ; do \
+		echo Clean image: $$arch ; \
+		make clean-image ARCH=$$arch ; \
+	done
+	-docker rmi "${REPOSITORY_GENERIC}"
+
+clean-image:
+	-docker rmi "${BUILDER}"
+	-docker rmi "${REPOSITORY_ARCH}"
+	-rm -rf ~/.docker/manifests/*
 
 clean:
 	"$(GOCMD)" clean -i
-
-push: ## push the latest Docker image to DockerHub
-	docker push $(REPOSITORY)
+	-rm -rf reloader-*.tar
 
 apply:
 	kubectl apply -f deployments/manifests/ -n temp-reloader