Skip to content

Commit 27edff5

Browse files
author
Shreyas-Microsoft
committed
use oidc
1 parent a9629ba commit 27edff5

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

.github/workflows/build-docker-image.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ permissions:
5252
jobs:
5353
build-and-push:
5454
runs-on: ubuntu-latest
55+
environment: production
5556
env:
5657
ACR_LOGIN_SERVER: ${{ secrets.ACR_LOGIN_SERVER }}
57-
ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
58-
ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
5958

6059
steps:
6160
- name: Checkout repository
@@ -68,13 +67,17 @@ jobs:
6867
id: date
6968
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
7069

71-
- name: Log in to Azure Container Registry
70+
- name: Login to Azure
7271
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' || github.ref_name == 'psl-docker-build-and-push-v2' }}
73-
uses: azure/docker-login@v2
72+
uses: azure/login@v2
7473
with:
75-
login-server: ${{ env.ACR_LOGIN_SERVER }}
76-
username: ${{ env.ACR_USERNAME }}
77-
password: ${{ env.ACR_PASSWORD }}
74+
client-id: ${{ secrets.AZURE_CLIENT_ID }}
75+
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
76+
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
77+
78+
- name: Log in to Azure Container Registry
79+
if: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'hotfix' || github.ref_name == 'dependabotchanges' || github.ref_name == 'psl-docker-build-and-push-v2' }}
80+
run: az acr login --name ${{ env.ACR_LOGIN_SERVER }}
7881

7982
- name: Get registry
8083
id: registry

0 commit comments

Comments
 (0)