From 6dfca2aea0f56757e57d335a696c4e9ebe35f460 Mon Sep 17 00:00:00 2001
From: markliu2013 <markliu2013@gmail.com>
Date: Tue, 9 Jan 2024 01:04:12 +0800
Subject: [PATCH] save

---
 .github/workflows/docker-publish-ali.yml | 17 ++++++++++++-----
 .github/workflows/docker-publish.yml     |  9 +++++++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-publish-ali.yml b/.github/workflows/docker-publish-ali.yml
index a905da5..4d2330a 100644
--- a/.github/workflows/docker-publish-ali.yml
+++ b/.github/workflows/docker-publish-ali.yml
@@ -19,14 +19,21 @@ jobs:
         run: npm install
       - name: Generate build
         run: npm run build
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Login to Aliyun Container Registry (ACR)
-        uses: aliyun/acr-login@v1
+        uses: docker/login-action@v3
         with:
-          login-server: https://registry.cn-hangzhou.aliyuncs.com
+          registry: registry.cn-hangzhou.aliyuncs.com
           #          region-id: cn-hangzhou  # 3
           username: "${{ secrets.ACR_USERNAME }}"
           password: "${{ secrets.ACR_PASSWORD }}"
       - name: Build and Push Docker Image
-        run: |
-          docker build -t registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user:latest .
-          docker push registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user:latest
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: registry.cn-hangzhou.aliyuncs.com/moneywhere/moneywhere-fe-user:latest
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 433a8d0..01dead6 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -19,14 +19,19 @@ jobs:
         run: npm install
       - name: Generate build
         run: npm run build
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASS }}
       - name: Build and Push Docker Image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: markliu2018/moneywhere-fe-user:latest