@@ -151,7 +151,6 @@ jobs:
151151 matrix :
152152 python-version : ['3.8']
153153 env :
154- DOCKERS_AZURE : " ./inputs/values/dockers_azure.json"
155154 DOCKERS_GCP : " ./inputs/values/dockers.json"
156155 steps :
157156 - name : Checkout code
@@ -167,13 +166,6 @@ jobs:
167166 with :
168167 python-version : ${{ matrix.python-version }}
169168
170- - name : Azure login
171- uses : azure/docker-login@v2
172- with :
173- login-server : ${{ secrets.AZ_CR }}
174- username : ${{ secrets.AZ_USERNAME }}
175- password : ${{ secrets.AZ_PASSWORD }}
176-
177169 - name : GCP login
178170 uses : google-github-actions/auth@v2.0.0
179171 with :
@@ -213,16 +205,16 @@ jobs:
213205 sudo mv "$tmp" /etc/docker/daemon.json
214206 sudo systemctl restart docker.service
215207
216- - name : Build and Publish Docker Images to ACR & GCR
208+ - name : Build and Publish Docker Images to Google Artifact Registry
217209 id : build_and_publish
218210 run : |
219211 python ./scripts/docker/build_docker.py \
220212 --base-git-commit ${{ needs.build_args_job.outputs.base_sha }} \
221213 --current-git-commit ${{ needs.build_args_job.outputs.head_sha }} \
222- --docker-repo ${{ secrets.AZ_CR }} us.gcr.io/${{ secrets.GCP_PROJECT_ID }}/gatk-sv \
214+ --docker-repo us.gcr.io/${{ secrets.GCP_PROJECT_ID }}/gatk-sv \
223215 --image-tag ${{ needs.build_args_job.outputs.image_tag }} \
224- --input-json $DOCKERS_AZURE $ DOCKERS_GCP \
225- --output-json $DOCKERS_AZURE $ DOCKERS_GCP \
216+ --input-json $DOCKERS_GCP \
217+ --output-json $DOCKERS_GCP \
226218 --disable-git-protect \
227219 --prune-after-each-image
228220
@@ -235,7 +227,7 @@ jobs:
235227 COMMIT_SHA=${{ needs.build_args_job.outputs.head_sha }}
236228 git config --global user.name 'gatk-sv-bot'
237229 git config --global user.email '101641599+gatk-sv-bot@users.noreply.github.com'
238- git commit $DOCKERS_AZURE $ DOCKERS_GCP -m "Update docker images list, triggered by "${COMMIT_SHA::8}
230+ git commit $DOCKERS_GCP -m "Update docker images list, triggered by "${COMMIT_SHA::8}
239231 git pull --rebase origin main
240232
241233 # In the following, force-push is required when the above rebase updates the branch;
0 commit comments