File tree Expand file tree Collapse file tree 2 files changed +14
-12
lines changed
eng/common/pipelines/templates/steps Expand file tree Collapse file tree 2 files changed +14
-12
lines changed Original file line number Diff line number Diff line change 1
1
parameters :
2
- - name : ContainerRegistryClientId
3
- type : string
4
- - name : ContainerRegistryClientSecret
2
+ - name : ServiceConnectionName
5
3
type : string
4
+ default : azuresdkimages_container-registry
6
5
- name : ImageId
7
6
type : string
8
7
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 }}'
Original file line number Diff line number Diff line change 87
87
- ${{ if ne(parameters.DocValidationImageId, '') }} :
88
88
- template : /eng/common/pipelines/templates/steps/docker-pull-image.yml
89
89
parameters :
90
- ContainerRegistryClientId : $(azuresdkimages-cr-clientid)
91
- ContainerRegistryClientSecret : $(azuresdkimages-cr-clientsecret)
92
90
ImageId : ' ${{ parameters.DocValidationImageId }}'
93
91
- pwsh : |
94
92
$packageInfoJson = '${{ convertToJson(parameters.PackageInfoLocations) }}'.Trim('"').Replace("\\", "/")
You can’t perform that action at this time.
0 commit comments