Skip to content

Commit baace26

Browse files
authored
Convert to using Az CLI for docker publish (#8143)
1 parent 8a653ed commit baace26

2 files changed

Lines changed: 18 additions & 22 deletions

File tree

eng/pipelines/publish-docker-image-isolated.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,38 +49,37 @@ stages:
4949
templateContext:
5050
outputs:
5151
- output: containerImage
52-
displayName: Push ${{ config.name }}:${{ parameters.ImageTag }}
52+
displayName: Push ${{ config.name }}
5353
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
54-
image: ${{ parameters.ContainerRegistry }}.azurecr.io/${{ config.dockerRepo }}:${{ parameters.ImageTag }}
55-
- ${{ if config.stableTags }}:
56-
- ${{ each stableTag in config.stableTags }}:
57-
- output: containerImage
58-
displayName: Push ${{ config.name }}:${{ stableTag }}
59-
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
60-
image: ${{ parameters.ContainerRegistry }}.azurecr.io/${{ config.dockerRepo }}:${{ stableTag }}
54+
image: image:tag
55+
remoteImage:
56+
- ${{ parameters.ContainerRegistry }}.azurecr.io/${{ config.dockerRepo }}:${{ parameters.ImageTag }}
57+
- ${{ if config.stableTags }}:
58+
- ${{ each stableTag in config.stableTags }}:
59+
- ${{ parameters.ContainerRegistry }}.azurecr.io/${{ config.dockerRepo }}:${{ stableTag }}
6160

6261
steps:
62+
- task: AzureCLI@2
63+
displayName: Login to $(containerRegistry)
64+
inputs:
65+
azureSubscription: "Azure SDK Engineering System"
66+
scriptType: pscore
67+
scriptLocation: inlineScript
68+
inlineScript: |
69+
az acr login --name $(containerRegistry)
70+
6371
- ${{ if config.prepareScript }}:
6472
- pwsh: |
6573
./${{ config.prepareScript }}
6674
displayName: "Run prep script"
75+
6776
- task: 1ES.BuildContainerImage@1
6877
displayName: Build ${{ config.name }}:${{ parameters.ImageTag }}
6978
inputs:
70-
image: ${{ parameters.ContainerRegistry }}.azurecr.io/${{ config.dockerRepo }}:${{ parameters.ImageTag }}
79+
image: image:tag
7180
path: ${{ config.configPath }}
7281
enableNetwork: true
7382
useBuildKit: true
74-
- ${{ if config.stableTags }}:
75-
- ${{ each stableTag in config.stableTags }}:
76-
- task: 1ES.BuildContainerImage@1
77-
displayName: Build ${{ config.name }}:${{ stableTag }}
78-
condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
79-
inputs:
80-
image: ${{ parameters.ContainerRegistry }}.azurecr.io/${{ config.dockerRepo }}:${{ stableTag }}
81-
path: ${{ config.configPath }}
82-
enableNetwork: true
83-
useBuildKit: true
8483

8584
- ${{ if and(parameters.ManifestDeployment, parameters.Publish) }}:
8685
- ${{ each deployment in parameters.ManifestDeployment }}:

eng/pipelines/templates/stages/1es-redirect.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ extends:
2323
${{ else }}:
2424
template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
2525
parameters:
26-
${{ if and(parameters.Use1ESOfficial, eq(variables['System.TeamProject'], 'internal')) }}:
27-
authenticatedContainerRegistries:
28-
- serviceConnection: azsdkengsys
2926
settings:
3027
skipBuildTagsForGitHubPullRequests: true
3128
sdl:

0 commit comments

Comments
 (0)