save

getmoneynote · Jan 10, 2024 · 6dfca2a · 6dfca2a
1 parent 9940fe9
commit 6dfca2a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git 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
@@ -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