diff --git a/.github/workflows/build-docker-image.yml b/.github/workflows/build-docker-image.yml index 320f34e393a..73d9f15c16e 100644 --- a/.github/workflows/build-docker-image.yml +++ b/.github/workflows/build-docker-image.yml @@ -62,6 +62,13 @@ jobs: username: ${{ secrets.ALI_DOCKER_USERNAME }} password: ${{ secrets.ALI_DOCKER_PASSWORD }} + - name: Login to Aliyun Container Registry (Public) + uses: docker/login-action@v2 + with: + registry: ${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }} + username: ${{ secrets.ALI_DOCKER_USERNAME }} + password: ${{ secrets.ALI_DOCKER_PASSWORD }} + - name: Login to Docker Hub if: github.ref == 'refs/heads/main' uses: docker/login-action@v2 @@ -73,9 +80,9 @@ jobs: id: set-tags run: | if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then - echo "::set-output name=tags::${{ steps.meta.outputs.tags }},${{ secrets.ALI_DOCKER_REGISTRY }}/${{ steps.meta.outputs.tags }}" + echo "::set-output name=tags::${{ steps.meta.outputs.tags }},${{ secrets.ALI_DOCKER_REGISTRY }}/${{ steps.meta.outputs.tags }},${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/${{ steps.meta.outputs.tags }}" else - echo "::set-output name=tags::${{ secrets.ALI_DOCKER_REGISTRY }}/${{ steps.meta.outputs.tags }}" + echo "::set-output name=tags::${{ secrets.ALI_DOCKER_REGISTRY }}/${{ steps.meta.outputs.tags }}" fi - name: Build and push diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e49e764eb82..392ebc45a89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -87,10 +87,16 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to Aliyun Container Registry (Public) + uses: docker/login-action@v2 + with: + registry: ${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }} + username: ${{ secrets.ALI_DOCKER_USERNAME }} + password: ${{ secrets.ALI_DOCKER_PASSWORD }} - name: Build and push uses: docker/build-push-action@v3 with: context: ./docker/nocobase platforms: linux/amd64,linux/arm64 push: true - tags: nocobase/nocobase:latest,${{ steps.meta.outputs.tags }} + tags: nocobase/nocobase:latest,${{ steps.meta.outputs.tags }},${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/nocobase/nocobase:latest,${{ secrets.ALI_DOCKER_PUBLIC_REGISTRY }}/${{ steps.meta.outputs.tags }}