From 20447d8ab2485273be733d9039905d6ce6dfdb42 Mon Sep 17 00:00:00 2001 From: Shengzhou Li Date: Thu, 30 Jun 2022 20:27:26 +0900 Subject: [PATCH] Update docker-images.yml --- .github/workflows/docker-images.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml index 1fa0979..42686fe 100644 --- a/.github/workflows/docker-images.yml +++ b/.github/workflows/docker-images.yml @@ -28,6 +28,13 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Login to Alibaba Cloud Container Registry (ACR) + uses: docker/login-action@v2 + with: + registry: registry.cn-shanghai.aliyuncs.com + username: ${{ secrets.ACR_USERNAME }} + password: ${{ secrets.ACR_PASSWORD }} - name: Generate App Version run: echo APP_VERSION=`git describe --tags --always` >> $GITHUB_ENV @@ -52,18 +59,5 @@ jobs: tags: | ${{ env.DOCKERHUB_REPO }}:latest ${{ env.DOCKERHUB_REPO }}:${{ env.APP_VERSION }} - - - name: Login to Alibaba Cloud Container Registry (ACR) - uses: docker/login-action@v2 - with: - registry: registry.cn-shanghai.aliyuncs.com - username: ${{ secrets.ACE_USERNAME }} - password: ${{ secrets.ACR_PASSWORD }} - - - name: Push Images to ACR - uses: akhilerm/tag-push-action@v2.0.0 - with: - src: docker.io/${{ env.DOCKERHUB_REPO }}:${{ env.APP_VERSION }} - dst: | registry.cn-shanghai.aliyuncs.com/${{ env.DOCKERHUB_REPO }}:latest registry.cn-shanghai.aliyuncs.com/${{ env.DOCKERHUB_REPO }}:${{ env.APP_VERSION }}