[Test] Build different arch image parallelly

Author: tung2744

.github/workflows/ci.yaml

@@ -223,15 +223,15 @@ jobs:
           safe_image_name=$(echo -n "$image" | tr '/:' '_')
           docker save "$image" -o ~/.cache/images/"$safe_image_name".tar
         done
-  authgear-image:
+  authgear-image-amd64:
     if: ${{ github.repository != 'oursky/authgear-server' }}
     runs-on: ubuntu-24.04
     needs: ["authgear-test", "authui-test"]
     env:
       TARGET: authgear
       IMAGE_NAME: quay.io/theauthgear/authgear-server
       PUSH_IMAGE: "${{ (github.repository == 'authgear/authgear-server' && github.event_name == 'push') && 'true' || 'false' }}"
-      BUILD_PLATFORMS: "${{ (github.repository == 'authgear/authgear-server' && github.event_name == 'push') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}"
+      BUILD_ARCH: amd64
     steps:
     - uses: actions/checkout@v4
     - name: Install qemu for multi arch build
@@ -249,7 +249,62 @@ jobs:
         DOCKER_PASSWORD: ${{ secrets.QUAY_ROBOT_TOKEN }}
       run: |
         printf "$DOCKER_PASSWORD" | docker login --password-stdin --username "$DOCKER_USERNAME" quay.io
-    - run: make build-image BUILD_PLATFORMS=$BUILD_PLATFORMS PUSH_IMAGE=$PUSH_IMAGE TAG_IMAGE=true TARGET=$TARGET IMAGE_NAME=$IMAGE_NAME
+    - run: make build-image BUILD_ARCH=$BUILD_ARCH PUSH_IMAGE=$PUSH_IMAGE TARGET=$TARGET IMAGE_NAME=$IMAGE_NAME
+    - name: docker logout
+      if: ${{ always() }}
+      run: |
+        docker logout quay.io
+  authgear-image-arm64:
+    if: ${{ github.repository != 'oursky/authgear-server' }}
+    runs-on: ubuntu-24.04
+    needs: ["authgear-test", "authui-test"]
+    env:
+      TARGET: authgear
+      IMAGE_NAME: quay.io/theauthgear/authgear-server
+      PUSH_IMAGE: "${{ (github.repository == 'authgear/authgear-server' && github.event_name == 'push') && 'true' || 'false' }}"
+      BUILD_ARCH: arm64
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install qemu for multi arch build
+      run: docker run --privileged --rm tonistiigi/binfmt --install all
+    - name: Setup container builder
+      run: |
+        docker buildx create \
+          --name container-builder \
+          --driver docker-container \
+          --bootstrap --use
+    - name: docker login
+      if: ${{ github.repository == 'authgear/authgear-server' && github.event_name == 'push' }}
+      env:
+        DOCKER_USERNAME: ${{ secrets.QUAY_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.QUAY_ROBOT_TOKEN }}
+      run: |
+        printf "$DOCKER_PASSWORD" | docker login --password-stdin --username "$DOCKER_USERNAME" quay.io
+    - run: make build-image BUILD_ARCH=$BUILD_ARCH PUSH_IMAGE=$PUSH_IMAGE TARGET=$TARGET IMAGE_NAME=$IMAGE_NAME
+    - name: docker logout
+      if: ${{ always() }}
+      run: |
+        docker logout quay.io
+
+  authgear-image:
+    if: ${{ github.repository != 'oursky/authgear-server' }}
+    runs-on: ubuntu-24.04
+    needs: ["authgear-image-amd64", "authgear-image-arm64"]
+    env:
+      TARGET: authgear
+      IMAGE_NAME: quay.io/theauthgear/authgear-server
+      PUSH_IMAGE: "${{ (github.repository == 'authgear/authgear-server' && github.event_name == 'push') && 'true' || 'false' }}"
+      SOURCE_ARCHS: arm64,amd64
+    steps:
+    - uses: actions/checkout@v4
+    - name: docker login
+      if: ${{ github.repository == 'authgear/authgear-server' && github.event_name == 'push' }}
+      env:
+        DOCKER_USERNAME: ${{ secrets.QUAY_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.QUAY_ROBOT_TOKEN }}
+      run: |
+        printf "$DOCKER_PASSWORD" | docker login --password-stdin --username "$DOCKER_USERNAME" quay.io
+    - run: make tag-image SOURCE_ARCHS=$SOURCE_ARCHS IMAGE_NAME=$IMAGE_NAME
     - name: docker logout
       if: ${{ always() }}
       run: |

common.mk

@@ -47,27 +47,46 @@ start-portal:
 build:
 	go build -o $(BIN_NAME) -tags "$(GO_BUILD_TAGS)" -ldflags ${LDFLAGS} ./cmd/$(TARGET)
 
+
+
 .PHONY: build-image
 build-image:
-	$(eval BUILD_OPTS ::= --tag $(IMAGE_NAME))
-ifeq (${TAG_IMAGE},true) # if TAG_IMAGE
-	$(eval BUILD_OPTS += --tag $(IMAGE_NAME):latest)
-ifneq (${GIT_HASH},)
-	$(eval BUILD_OPTS += --tag $(IMAGE_NAME):$(GIT_HASH))
+	$(eval IMAGE_TAG ::= $(IMAGE_NAME):$(GIT_HASH))
+	$(eval BUILD_OPTS ::= --tag $(IMAGE_TAG) )
+ifeq ($(BUILD_ARCH),amd64)
+	$(eval BUILD_OPTS += --platform linux/$(BUILD_ARCH) )
+	$(eval IMAGE_TAG += $(IMAGE_NAME):$(GIT_HASH)-$(BUILD_ARCH) )
+else ifeq ($(BUILD_ARCH),arm64)
+	$(eval BUILD_OPTS += --platform linux/$(BUILD_ARCH) )
+	$(eval IMAGE_TAG += $(IMAGE_NAME):$(GIT_HASH)-$(BUILD_ARCH) )
+else
 endif
-ifneq (${GIT_NAME},)
-	$(eval BUILD_OPTS += --tag $(IMAGE_NAME):$(GIT_NAME))
-endif
-endif # endif TAG_IMAGE
 ifeq ($(PUSH_IMAGE),true)
 	$(eval BUILD_OPTS += --push)
 endif
-ifneq ($(BUILD_PLATFORMS),)
-	$(eval BUILD_OPTS += --platform $(BUILD_PLATFORMS))
+ifeq ($(EXTRA_BUILD_OPTS),true)
+	$(eval BUILD_OPTS += $(EXTRA_BUILD_OPTS))
 endif
 	@# Add --pull so that we are using the latest base image.
 	@# The build context is the parent directory
-	docker build --pull --ssh=default \
+	docker build --pull \
 		--file ./cmd/$(TARGET)/Dockerfile \
 		$(BUILD_OPTS) \
 		--build-arg GIT_HASH=$(GIT_HASH) ${BUILD_CTX}
+
+.PHONY: tag-image
+tag-image:
+	$(eval IMAGE_SOURCES ::= )
+	$(eval TAGS ::= --tag $(IMAGE_NAME):$(GIT_HASH))
+ifneq (${GIT_NAME},)
+	$(eval TAGS += --tag $(IMAGE_NAME):$(GIT_NAME))
+endif
+ifneq ($(findstring amd64,$(SOURCE_ARCHS)),)
+	$(eval IMAGE_SOURCES += $(IMAGE_NAME):$(GIT_HASH)-amd64 )
+endif
+ifneq ($(findstring arm64,$(SOURCE_ARCHS)),)
+	$(eval IMAGE_SOURCES += $(IMAGE_NAME):$(GIT_HASH)-arm64 )
+endif
+	docker buildx imagetools create \
+		--tag $(IMAGE_TAG) \
+		$(IMAGE_SOURCES)