Support arm

Signed-off-by: shaoyue.chen <[email protected]>
haorenfsa · Jan 15, 2024 · ef5ef66 · ef5ef66
1 parent bfcbe1f
commit ef5ef66
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -37,16 +37,20 @@ jobs:
         run: |
           IMAGE_TAG=${{ steps.extracter.outputs.git_tag }}
           echo "Start Building ${REGISTRY_NAME}:${IMAGE_TAG}"
-          docker build -t ${REGISTRY_NAME}:${IMAGE_TAG} .
-          docker tag ${REGISTRY_NAME}:${IMAGE_TAG} ${REGISTRY_NAME}:latest
+          docker build --platform=linux/amd64 -t ${REGISTRY_NAME}:${IMAGE_TAG}-amd64 .
+          docker build --platform=linux/arm64 -t ${REGISTRY_NAME}:${IMAGE_TAG}-arm64 .
       - name: Push Docker Image
         shell: bash
         run: |
           IMAGE_TAG=${{ steps.extracter.outputs.git_tag }}
           docker login -u ${{ secrets.MILVUSDB_DOCKER_USER }} \
                        -p ${{ secrets.MILVUSDB_DOCKER_PWD }}
-          docker push ${REGISTRY_NAME}:${IMAGE_TAG}
-          docker push ${REGISTRY_NAME}:latest
+          docker push ${REGISTRY_NAME}:${IMAGE_TAG}-amd64
+          docker push ${REGISTRY_NAME}:${IMAGE_TAG}-arm64
+          docker manifest create ${REGISTRY_NAME}:${IMAGE_TAG} ${REGISTRY_NAME}:${IMAGE_TAG}-amd64 ${REGISTRY_NAME}:${IMAGE_TAG}-arm64
+          docker manifest create ${REGISTRY_NAME}:latest ${REGISTRY_NAME}:${IMAGE_TAG}-amd64 ${REGISTRY_NAME}:${IMAGE_TAG}-arm64
+          docker manifest push ${REGISTRY_NAME}:${IMAGE_TAG}
+          docker manifest push ${REGISTRY_NAME}:latest
 
   tool-publish:
     name: Tool Publish Builder

diff --git a/Makefile b/Makefile
@@ -93,13 +93,13 @@ build-only:
 
 build-config-tool:
 	mkdir -p out
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o out/merge ./tool/merge
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o out/cp ./tool/cp
+	CGO_ENABLED=0 go build -ldflags="-s -w" -o out/merge ./tool/merge
+	CGO_ENABLED=0 go build -ldflags="-s -w" -o out/cp ./tool/cp
 
 build-release: build-config-tool
 	mkdir -p out
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="$(BUILD_LDFLAGS)" -o out/manager main.go
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o out/checker ./tool/checker
+	CGO_ENABLED=0 go build -ldflags="$(BUILD_LDFLAGS)" -o out/manager main.go
+	CGO_ENABLED=0 go build -ldflags="-s -w" -o out/checker ./tool/checker
 
 run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./main.go
@@ -135,10 +135,12 @@ docker-tool-prepare: build-config-tool
 	cp ./out/cp ./out/tool/cp
 
 docker-tool-build:
-	docker build -t ${TOOL_RELEASE_IMG} -f tool.Dockerfile . 
+	docker build --platform=linux/amd64 -t ${TOOL_RELEASE_IMG}-amd64 -f tool.Dockerfile .
+	docker build --platform=linux/arm64 -t ${TOOL_RELEASE_IMG}-arm64 -f tool.Dockerfile .
 
 docker-tool-push:
-	docker push ${TOOL_RELEASE_IMG} 
+	docker manifest create ${TOOL_RELEASE_IMG} ${TOOL_RELEASE_IMG}-amd64 ${TOOL_RELEASE_IMG}-arm64
+	docker manifest push ${TOOL_RELEASE_IMG}
 
 docker-local-build:
 	docker build -t ${IMG} -f local.Dockerfile .