Skip to content

Commit 66a9cae

Browse files
Sync eng/common directory with azure-sdk-tools for PR 8015 (#35065)
* Use different service connection and az CLI for ACR auth * displayName --------- Co-authored-by: Daniel Jurek <[email protected]>
1 parent 7031867 commit 66a9cae

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed
Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
parameters:
2-
- name: ContainerRegistryClientId
3-
type: string
4-
- name: ContainerRegistryClientSecret
2+
- name: ServiceConnectionName
53
type: string
4+
default: azuresdkimages_container-registry
65
- name: ImageId
76
type: string
87
steps:
9-
- pwsh: |
10-
$containerRegistry = ("${{parameters.ImageId}}" -split "\/")[0]
11-
docker login $containerRegistry -u "${{ parameters.ContainerRegistryClientId }}" -p "${{ parameters.ContainerRegistryClientSecret }}"
12-
displayName: Login container registry
13-
- pwsh: |
14-
docker pull '${{ parameters.ImageId}}'
15-
displayName: Pull docker image ${{ parameters.ImageId }}
8+
- task: AzureCLI@2
9+
displayName: Docker Auth and Pull
10+
inputs:
11+
azureSubscription: ${{ parameters.ServiceConnectionName }}
12+
scriptType: pscore
13+
scriptLocation: inlineScript
14+
inlineScript: |
15+
# azuresdkimages.azurecr.io/pyrefautocr:latest -> azuresdkimages
16+
$containerRegistryName = ("${{ parameters.ImageId }}" -split "\/")[0].Replace(".azurecr.io", "")
17+
18+
az acr login --name $containerRegistryName
19+
docker pull '${{ parameters.ImageId }}'

eng/common/pipelines/templates/steps/update-docsms-metadata.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ steps:
8787
- ${{ if ne(parameters.DocValidationImageId, '') }}:
8888
- template: /eng/common/pipelines/templates/steps/docker-pull-image.yml
8989
parameters:
90-
ContainerRegistryClientId: $(azuresdkimages-cr-clientid)
91-
ContainerRegistryClientSecret: $(azuresdkimages-cr-clientsecret)
9290
ImageId: '${{ parameters.DocValidationImageId }}'
9391
- pwsh: |
9492
$packageInfoJson = '${{ convertToJson(parameters.PackageInfoLocations) }}'.Trim('"').Replace("\\", "/")

0 commit comments

Comments
 (0)