Sync eng/common directory with azure-sdk-tools for PR 8015 (#5487)
* Use different service connection and az CLI for ACR auth * displayName --------- Co-authored-by: Daniel Jurek <djurek@microsoft.com>
This commit is contained in:
parent
62cbe519c3
commit
408bd2bead
@ -1,15 +1,19 @@
|
||||
parameters:
|
||||
- name: ContainerRegistryClientId
|
||||
type: string
|
||||
- name: ContainerRegistryClientSecret
|
||||
- name: ServiceConnectionName
|
||||
type: string
|
||||
default: azuresdkimages_container-registry
|
||||
- name: ImageId
|
||||
type: string
|
||||
steps:
|
||||
- pwsh: |
|
||||
$containerRegistry = ("${{parameters.ImageId}}" -split "\/")[0]
|
||||
docker login $containerRegistry -u "${{ parameters.ContainerRegistryClientId }}" -p "${{ parameters.ContainerRegistryClientSecret }}"
|
||||
displayName: Login container registry
|
||||
- pwsh: |
|
||||
docker pull '${{ parameters.ImageId}}'
|
||||
displayName: Pull docker image ${{ parameters.ImageId }}
|
||||
- task: AzureCLI@2
|
||||
displayName: Docker Auth and Pull
|
||||
inputs:
|
||||
azureSubscription: ${{ parameters.ServiceConnectionName }}
|
||||
scriptType: pscore
|
||||
scriptLocation: inlineScript
|
||||
inlineScript: |
|
||||
# azuresdkimages.azurecr.io/pyrefautocr:latest -> azuresdkimages
|
||||
$containerRegistryName = ("${{ parameters.ImageId }}" -split "\/")[0].Replace(".azurecr.io", "")
|
||||
|
||||
az acr login --name $containerRegistryName
|
||||
docker pull '${{ parameters.ImageId }}'
|
||||
|
||||
@ -87,8 +87,6 @@ steps:
|
||||
- ${{ if ne(parameters.DocValidationImageId, '') }}:
|
||||
- template: /eng/common/pipelines/templates/steps/docker-pull-image.yml
|
||||
parameters:
|
||||
ContainerRegistryClientId: $(azuresdkimages-cr-clientid)
|
||||
ContainerRegistryClientSecret: $(azuresdkimages-cr-clientsecret)
|
||||
ImageId: '${{ parameters.DocValidationImageId }}'
|
||||
- pwsh: |
|
||||
$packageInfoJson = '${{ convertToJson(parameters.PackageInfoLocations) }}'.Trim('"').Replace("\\", "/")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user