@@ -31,10 +31,15 @@ jobs:
3131 if : ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
3232 uses : azure/docker-login@v2
3333 with :
34- login-server : ${{ env.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io' }}
34+ login-server : ${{ env.ACR_LOGIN_SERVER }}
3535 username : ${{ env.ACR_USERNAME }}
3636 password : ${{ env.ACR_PASSWORD }}
37-
37+
38+ - name : Get registry
39+ id : registry
40+ run : |
41+ echo "ext_registry=${{ env.ACR_LOGIN_SERVER || 'acrlogin.azurecr.io'}}" >> $GITHUB_OUTPUT
42+
3843 - name : Set Docker image tags
3944 id : tag
4045 run : |
6469 file : ./src/ContentProcessor/Dockerfile
6570 push : ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
6671 tags : |
67- ${{ env.ACR_LOGIN_SERVER }}/contentprocessor:${{ env.BASE_TAG }}
68- ${{ env.ACR_LOGIN_SERVER }}/contentprocessor:${{ env.DATE_TAG }}
72+ ${{ steps.registry.outputs.ext_registry }}/contentprocessor:${{ env.BASE_TAG }}
73+ ${{ steps.registry.outputs.ext_registry }}/contentprocessor:${{ env.DATE_TAG }}
6974
7075 - name : Build and Push ContentProcessorAPI Docker image
7176 uses : docker/build-push-action@v6
7479 file : ./src/ContentProcessorAPI/Dockerfile
7580 push : ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
7681 tags : |
77- ${{ env.ACR_LOGIN_SERVER }}/contentprocessorapi:${{ env.BASE_TAG }}
78- ${{ env.ACR_LOGIN_SERVER }}/contentprocessorapi:${{ env.DATE_TAG }}
82+ ${{ steps.registry.outputs.ext_registry }}/contentprocessorapi:${{ env.BASE_TAG }}
83+ ${{ steps.registry.outputs.ext_registry }}/contentprocessorapi:${{ env.DATE_TAG }}
7984
8085 - name : Build and Push ContentProcessorWeb Docker image
8186 uses : docker/build-push-action@v6
8489 file : ./src/ContentProcessorWeb/Dockerfile
8590 push : ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' }}
8691 tags : |
87- ${{ env.ACR_LOGIN_SERVER }}/contentprocessorweb:${{ env.BASE_TAG }}
88- ${{ env.ACR_LOGIN_SERVER }}/contentprocessorweb:${{ env.DATE_TAG }}
92+ ${{ steps.registry.outputs.ext_registry }}/contentprocessorweb:${{ env.BASE_TAG }}
93+ ${{ steps.registry.outputs.ext_registry }}/contentprocessorweb:${{ env.DATE_TAG }}
0 commit comments