fix: change docker push

Signed-off-by: harlee-x <hailin097@sina.com>

Author: harlee-x

.github/workflows/ci-infra-build.yaml

@@ -93,7 +93,6 @@ jobs:
         uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
         with:
           submodules: true
-
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7
         with:
@@ -105,6 +104,10 @@ jobs:
           path: .work/pkg
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-pkg-
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
 
       - uses: actions/checkout@v4
       - name: Docker Login
@@ -114,7 +117,9 @@ jobs:
           password: ${{ secrets.REG_PASSWD }}
 
       - name: Run Build Images
-        run: make kdp-infra-build IMG_REGISTRY=${{ secrets.CONTAINER_REGISTRY }}
+        run: |
+          make multi-arch-builder IMG_REGISTRY=${{ secrets.CONTAINER_REGISTRY }}
+          make publish IMG_REGISTRY=${{ secrets.CONTAINER_REGISTRY }}
 
       - name: Cleanup binary
         run: make kdp-cli-clean

kdp.Dockerfile

@@ -1,24 +1,22 @@
-ARG ARCH=amd64
-FROM --platform=${ARCH} ghcr.io/flant/shell-operator:latest as builder
+ARG TARGETARCH
+FROM --platform=linux/${TARGETARCH} ghcr.io/flant/shell-operator:latest AS builder
 RUN apk --no-cache add python3 \
     && python3 -m venv --copies /venv
 
-FROM builder as pip-package
+FROM builder AS pip-package
 ENV PATH="/venv/bin:$PATH"
 
-
 RUN pip install --no-cache --upgrade pip kubernetes==26.1.0 jsonpath==0.82.2 deepdiff==7.0.1
 
 
-FROM builder as image
-
+FROM builder AS image
+ARG TARGETARCH
 ARG VERSION
-ARG ARCH
 ENV KDP_ROOT_DIR=${KDP_ROOT_DIR:-.kdp}
 ENV PATH="/venv/bin:$PATH"
 
 ADD hooks/* /hooks
-ADD cmd/output/${VERSION}/kdp-linux-${ARCH} /usr/local/bin/kdp
+ADD cmd/output/${VERSION}/kdp-linux-$TARGETARCH /usr/local/bin/kdp
 
 COPY --from=pip-package /venv /venv
 

makefiles/build.mk

@@ -1,6 +1,10 @@
 ##@ Docker image info
 IMG			   ?= linktimecloud/kubernetes-data-platform:$(VERSION)
+KDP_IMG        ?= linktimecloud/kdp:$(VERSION)
 IMG_REGISTRY   ?= ""
+OUTPUT_TYPE 	:= registry
+TARGETARCHS 	:= amd64 arm64
+ALL_OS_ARCH 	:= linux-arm64 linux-amd64
 
 ##@ Build docker image
 .PHONY: docker-build
@@ -46,13 +50,29 @@ kdp-cli-clean:
 ##@ Build infra image
 .PHONY: kdp-infra-build
 kdp-infra-build:
-	for arch in amd64 arm64; do \
-		env GOOS=linux GOARCH=$$arch \
-		go build -ldflags "-X kdp/cmd.CliVersion=$(VERSION) -X kdp/cmd.CliGoVersion=$(GO_VERSION) -X kdp/cmd.CliGitCommit=$(GIT_COMMIT) -X \"kdp/cmd.CliBuiltAt=$(BUILD_DATE)\" -X \"kdp/cmd.CliOSArch=$$arch\"" -o ./cmd/output/$(VERSION)/kdp-linux-$$arch; \
-		if [ -n "$(IMG_REGISTRY)" ]; then \
-			docker buildx build --platform linux/$$arch --build-arg VERSION="$(VERSION)" --output=type=image,name=$(IMG_REGISTRY)/kdp:$(VERSION),push=true -f kdp.Dockerfile . ; \
-		else \
-			docker buildx build --platform linux/$$arch --build-arg VERSION="$(VERSION)" --output=type=docker,name=kdp-$$arch:$(VERSION) -f kdp.Dockerfile . ; \
-		fi \
-	done
+	go build -ldflags "-X kdp/cmd.CliVersion=$(VERSION) -X kdp/cmd.CliGoVersion=$(GO_VERSION) -X kdp/cmd.CliGitCommit=$(GIT_COMMIT) -X \"kdp/cmd.CliBuiltAt=$(BUILD_DATE)\" -X \"kdp/cmd.CliOSArch=$$arch\"" -o ./cmd/output/$(VERSION)/kdp-linux-$(TARGETARCH); \
+	docker buildx build \
+		--output=type=$(OUTPUT_TYPE) \
+		--platform linux/$(TARGETARCH) \
+		--provenance false \
+		--build-arg VERSION=$(VERSION) \
+		--build-arg TARGETARCH=$(TARGETARCH) \
+		-t $(IMG_REGISTRY)/$(KDP_IMG)-linux-$(TARGETARCH) \
+		-f kdp.Dockerfile .
+	@$(OK)
+
+
+##@ push infra image
+.PHONY: publish
+publish:
+	docker manifest create --amend $(IMG_REGISTRY)/$(KDP_IMG) $(foreach osarch, $(ALL_OS_ARCH), $(IMG_REGISTRY)/$(KDP_IMG)-${osarch})
+	docker manifest push --purge $(IMG_REGISTRY)/$(KDP_IMG)
+	docker manifest inspect $(IMG_REGISTRY)/$(KDP_IMG)
+
 
+##@ Build multi-arch image
+.PHONY: multi-arch-builder
+multi-arch-builder:
+	for arch in $(TARGETARCHS); do \
+		TARGETARCH=$${arch} $(MAKE) kdp-infra-build;\
+    done