|
22 | 22 | - task/migrate-acr-pipeline |
23 | 23 |
|
24 | 24 | variables: |
25 | | - REGISTRY: 'msgraphpperegistry.azurecr.io' |
| 25 | + REGISTRY: 'msgraphprodregistry.azurecr.io' |
26 | 26 | IMAGE_NAME: 'public/openapi/hidi' |
27 | 27 | PREVIEW_BRANCH: 'refs/heads/task/migrate-acr-pipeline' |
28 | 28 |
|
|
35 | 35 | - task: AzureCLI@2 |
36 | 36 | displayName: 'Login to Azure Container Registry' |
37 | 37 | inputs: |
38 | | - azureSubscription: 'ACR Push Test' |
| 38 | + azureSubscription: 'ACR Images Push Service Connection' |
39 | 39 | scriptType: bash |
40 | 40 | scriptLocation: inlineScript |
41 | 41 | inlineScript: | |
@@ -89,35 +89,38 @@ steps: |
89 | 89 | |
90 | 90 | - bash: | |
91 | 91 | date=$(date +'%Y%m%d') |
| 92 | + echo "Date value: $date" |
| 93 | + echo "##vso[task.setvariable variable=BUILDDATE;isOutput=true]$date" |
92 | 94 | echo "##vso[task.setvariable variable=BUILDDATE]$date" |
93 | 95 | displayName: 'Get current date' |
| 96 | + name: setdate |
94 | 97 | condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH']) |
95 | 98 | |
96 | 99 | - bash: | |
97 | 100 | echo "Building Docker image..." |
| 101 | + echo "Using build date: ${BUILDDATE}" |
98 | 102 | # Using quotes around tags to prevent flag interpretation |
99 | 103 | docker build \ |
100 | | - --build-arg "version_suffix=preview.${BUILDDATE}${RUNNUMBER}" \ |
101 | 104 | -t "$(REGISTRY)/$(IMAGE_NAME):nightly" \ |
102 | | - -t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}" \ |
| 105 | + -t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}.${BUILDDATE}${RUNNUMBER}" \ |
103 | 106 | "$(Build.SourcesDirectory)" |
104 | 107 | |
105 | 108 | echo "Pushing Docker image with nightly tag..." |
106 | 109 | docker push "$(REGISTRY)/$(IMAGE_NAME):nightly" |
107 | | - docker push "$(REGISTRY)/$(IMAGE_NAME):${VERSION}" |
| 110 | + docker push "$(REGISTRY)/$(IMAGE_NAME):${VERSION}.${BUILDDATE}${RUNNUMBER}" |
108 | 111 | displayName: 'Build and Push Nightly Image' |
109 | 112 | condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH']) |
110 | 113 | |
111 | 114 | - bash: | |
112 | 115 | echo "Building Docker image for release..." |
113 | 116 | docker build \ |
114 | 117 | -t "$(REGISTRY)/$(IMAGE_NAME):latest" \ |
115 | | - -t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}" \ |
| 118 | + -t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}.${BUILDDATE}${RUNNUMBER}" \ |
116 | 119 | "$(Build.SourcesDirectory)" |
117 | 120 | |
118 | 121 | echo "Pushing Docker image with latest and version tags..." |
119 | 122 | docker push "$(REGISTRY)/$(IMAGE_NAME):latest" |
120 | | - docker push "$(REGISTRY)/$(IMAGE_NAME):${VERSION}" |
| 123 | + docker push "$(REGISTRY)/$(IMAGE_NAME):${VERSION}.${BUILDDATE}${RUNNUMBER}" |
121 | 124 | displayName: 'Build and Push Release Image' |
122 | 125 | condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v') |
123 | 126 |
|
0 commit comments