Update common Docker engineering infrastructure with latest

dotnet-docker-bot · dotnet-docker-bot · commit ec529173c1fa · 2025-06-09T10:00:34.000-07:00
diff --git a/eng/common/templates/1es-official.yml b/eng/common/templates/1es-official.yml
@@ -17,9 +17,6 @@ parameters:
 - name: stages
   type: stageList
   default: []
-- name: serviceConnections
-  type: object
-  default: []
 - name: pool
   type: object
   default:
@@ -62,9 +59,4 @@ extends:
         sourceAnalysisPool: ${{ parameters.sourceAnalysisPool }}
         tsa:
           enabled: true
-    stages:
-    - template: /eng/common/templates/stages/setup-service-connections.yml@self
-      parameters:
-        pool: ${{ parameters.pool }}
-        serviceConnections: ${{ parameters.serviceConnections }}
-    - ${{ parameters.stages }}
+    stages: ${{ parameters.stages }}
diff --git a/eng/common/templates/1es-unofficial.yml b/eng/common/templates/1es-unofficial.yml
@@ -20,9 +20,6 @@ parameters:
   type: stageList
   default: []
   # 1ES Pipeline Template parameters
-- name: serviceConnections
-  type: object
-  default: []
 - name: pool
   type: object
   default:
@@ -70,9 +67,4 @@ extends:
         sourceAnalysisPool: ${{ parameters.sourceAnalysisPool }}
         tsa:
           enabled: true
-    stages:
-    - template: /eng/common/templates/stages/setup-service-connections.yml@self
-      parameters:
-        pool: ${{ parameters.pool }}
-        serviceConnections: ${{ parameters.serviceConnections }}
-    - ${{ parameters.stages }}
+    stages: ${{ parameters.stages }}
diff --git a/eng/common/templates/jobs/build-images.yml b/eng/common/templates/jobs/build-images.yml
@@ -65,14 +65,10 @@ jobs:
     parameters:
       name: BuildImages
       displayName: Build Images
-      serviceConnections:
-      - name: acr
-        id: $(build.serviceConnection.id)
-        tenantId: $(build.serviceConnection.tenantId)
-        clientId: $(build.serviceConnection.clientId)
+      serviceConnection: $(build.serviceConnectionName)
       internalProjectName: ${{ parameters.internalProjectName }}
       dockerClientOS: ${{ parameters.dockerClientOS }}
-      args: >-
+      args: >
         build
         --manifest $(manifest)
         $(imageBuilderPaths)
diff --git a/eng/common/templates/jobs/copy-base-images-staging.yml b/eng/common/templates/jobs/copy-base-images-staging.yml
@@ -24,10 +24,7 @@ jobs:
     additionalOptions: ${{ parameters.additionalOptions }}
     acr:
       server: $(acr-staging.server)
-      serviceConnection:
-        tenantId: $(internal-mirror.serviceConnection.tenantId)
-        clientId: $(internal-mirror.serviceConnection.clientId)
-        id: $(internal-mirror.serviceConnection.id)
+      serviceConnection: $(internal-mirror.serviceConnectionName)
       subscription: $(acr-staging.subscription)
       resourceGroup: $(acr-staging.resourceGroup)
     repoPrefix: $(mirrorRepoPrefix)
diff --git a/eng/common/templates/jobs/copy-base-images.yml b/eng/common/templates/jobs/copy-base-images.yml
@@ -32,7 +32,7 @@ jobs:
   - ${{ parameters.customInitSteps }}
   - template: /eng/common/templates/steps/copy-base-images.yml@self
     parameters:
-      acr: ${{ parameters.acr }}
+      acr: ${{ parameters.acr }} 
       repoPrefix: ${{ parameters.repoPrefix }}
       additionalOptions: ${{ parameters.additionalOptions }}
       continueOnError: ${{ parameters.continueOnError }}
diff --git a/eng/common/templates/jobs/generate-matrix.yml b/eng/common/templates/jobs/generate-matrix.yml
@@ -61,10 +61,6 @@ jobs:
     parameters:
       name: matrix
       displayName: Generate ${{ parameters.matrixType }} Matrix
-      serviceConnections:
-      - name: acr
-        tenantId: $(build.serviceConnection.tenantId)
-        clientId: $(build.serviceConnection.clientId)
-        id: $(build.serviceConnection.id)
+      serviceConnection: $(build.serviceConnectionName)
       internalProjectName: internal
       args: $(generateBuildMatrixCommand)
diff --git a/eng/common/templates/jobs/publish.yml b/eng/common/templates/jobs/publish.yml
@@ -13,7 +13,7 @@ jobs:
 
   variables:
   - name: imageBuilder.commonCmdArgs
-    value: >-
+    value: >
       --manifest '$(manifest)'
       --registry-override '$(acr.server)'
       $(manifestVariables)
@@ -75,13 +75,9 @@ jobs:
   - template: /eng/common/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Copy Images
-      serviceConnections:
-      - name: acr
-        id: $(publish.serviceConnection.id)
-        tenantId: $(publish.serviceConnection.tenantId)
-        clientId: $(publish.serviceConnection.clientId)
+      serviceConnection: $(publish.serviceConnectionName)
       internalProjectName: ${{ parameters.internalProjectName }}
-      args: >-
+      args: >
         copyAcrImages
         '$(acr.subscription)'
         '$(acr.resourceGroup)'
@@ -98,14 +94,10 @@ jobs:
   - template: /eng/common/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Publish Manifest
-      serviceConnections:
-      - name: acr
-        id: $(publish.serviceConnection.id)
-        tenantId: $(publish.serviceConnection.tenantId)
-        clientId: $(publish.serviceConnection.clientId)
+      serviceConnection: $(publish.serviceConnectionName)
       internalProjectName: ${{ parameters.internalProjectName }}
       dockerClientOS: ${{ parameters.dockerClientOS }}
-      args: >-
+      args: >
         publishManifest
         '$(imageInfoContainerDir)/image-info.json'
         --repo-prefix '$(publishRepoPrefix)'
@@ -160,14 +152,10 @@ jobs:
   - template: /eng/common/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Ingest Kusto Image Info
-      serviceConnections:
-      - name: kusto
-        id: $(kusto.serviceConnection.id)
-        tenantId: $(kusto.serviceConnection.tenantId)
-        clientId: $(kusto.serviceConnection.clientId)
+      serviceConnection: $(kusto.serviceConnectionName)
       internalProjectName: ${{ parameters.internalProjectName }}
       condition: and(succeeded(), eq(variables['ingestKustoImageInfo'], 'true'))
-      args: >-
+      args: >
         ingestKustoImageInfo
         '$(imageInfoContainerDir)/image-info.json'
         '$(kusto.cluster)'
@@ -182,14 +170,10 @@ jobs:
   - template: /eng/common/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Generate EOL Annotation Data
-      serviceConnections:
-      - name: acr
-        id: $(publish.serviceConnection.id)
-        tenantId: $(publish.serviceConnection.tenantId)
-        clientId: $(publish.serviceConnection.clientId)
+      serviceConnection: $(publish.serviceConnectionName)
       internalProjectName: internal
       condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
-      args: >-
+      args: >
         generateEolAnnotationData
         '$(artifactsPath)/eol-annotation-data/eol-annotation-data.json'
         '$(imageInfoContainerDir)/full-image-info-orig.json'
diff --git a/eng/common/templates/stages/build-and-test.yml b/eng/common/templates/stages/build-and-test.yml
@@ -49,7 +49,6 @@ parameters:
 stages:
 - stage: Build
   condition: and(succeeded(), contains(variables['stages'], 'build'))
-  dependsOn: []
   jobs:
   - template: /eng/common/templates/jobs/test-images-linux-client.yml@self
     parameters:
diff --git a/eng/common/templates/steps/annotate-eol-digests.yml b/eng/common/templates/steps/annotate-eol-digests.yml
@@ -7,14 +7,10 @@ steps:
     parameters:
       name: AnnotateEOLImages
       displayName: Annotate EOL Images
-      serviceConnections:
-      - name: acr
-        id: $(publish.serviceConnection.id)
-        tenantId: $(publish.serviceConnection.tenantId)
-        clientId: $(publish.serviceConnection.clientId)
+      serviceConnection: $(publish.serviceConnectionName)
       internalProjectName: internal
       condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
-      args: >-
+      args: >
         annotateEolDigests
         ${{ parameters.dataFile }}
         $(acr.server)
@@ -32,13 +28,9 @@ steps:
   - template: /eng/common/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Wait for Annotation Ingestion
-      serviceConnections:
-      - name: mar
-        id: $(marStatus.serviceConnection.id)
-        tenantId: $(marStatus.serviceConnection.tenantId)
-        clientId: $(marStatus.serviceConnection.clientId)
+      serviceConnection: $(marStatus.serviceConnectionName)
       internalProjectName: internal
       condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'))
-      args: >-
+      args: >
         waitForMarAnnotationIngestion
         $(artifactsPath)/annotation-digests/annotation-digests.txt
diff --git a/eng/common/templates/steps/clean-acr-images.yml b/eng/common/templates/steps/clean-acr-images.yml
@@ -11,13 +11,9 @@ steps:
   - template: /eng/common/templates/steps/run-imagebuilder.yml@self
     parameters:
       displayName: Clean ACR Images - ${{ parameters.repo }}
-      serviceConnections:
-      - name: acr
-        id: $(clean.serviceConnection.id)
-        tenantId: $(clean.serviceConnection.tenantId)
-        clientId: $(clean.serviceConnection.clientId)
+      serviceConnection: $(clean.serviceConnectionName)
       internalProjectName: ${{ parameters.internalProjectName }}
-      args: >-
+      args: >
         cleanAcrImages
         ${{ parameters.repo }}
         ${{ parameters.subscription }}
diff --git a/eng/common/templates/steps/copy-base-images.yml b/eng/common/templates/steps/copy-base-images.yml
@@ -3,10 +3,7 @@ parameters:
   type: object
   default:
     server: ""
-    serviceConnection:
-      tenantId: ""
-      clientId: ""
-      id: ""
+    serviceConnection: ""
     subscription: ""
     resourceGroup: ""
 - name: repoPrefix
@@ -28,17 +25,13 @@ steps:
 - template: /eng/common/templates/steps/run-imagebuilder.yml@self
   parameters:
     displayName: Copy Base Images
-    serviceConnections:
-    - name: "acr"
-      tenantId: ${{ parameters.acr.serviceConnection.tenantId }}
-      clientId: ${{ parameters.acr.serviceConnection.clientId }}
-      id: ${{ parameters.acr.serviceConnection.id }}
+    serviceConnection: ${{ parameters.acr.serviceConnection }}
     continueOnError: ${{ parameters.continueOnError }}
     internalProjectName: 'internal'
     # Use environment variable to reference $(dryRunArg). Since $(dryRunArg) might be undefined,
     # PowerShell will treat the Azure Pipelines variable macro syntax as a command and throw an
     # error
-    args: >-
+    args: >
       copyBaseImages
       '${{ parameters.acr.subscription }}'
       '${{ parameters.acr.resourceGroup }}'
diff --git a/eng/common/templates/steps/init-docker-linux.yml b/eng/common/templates/steps/init-docker-linux.yml
@@ -24,27 +24,26 @@ steps:
   # Setup Image Builder (Optional)
   ################################################################################
 - ${{ if eq(parameters.setupImageBuilder, 'true') }}:
-
   - script: $(engCommonPath)/pull-image.sh $(imageNames.imageBuilder)
     displayName: Pull Image Builder
     condition: and(succeeded(), ${{ parameters.condition }})
-
-  - script: >-
+  - script: >
       docker build
       -t $(imageNames.imageBuilder.withrepo)
       --build-arg IMAGE=$(imageNames.imageBuilder)
       -f $(engCommonPath)/Dockerfile.WithRepo .
     displayName: Build Image for Image Builder
     condition: and(succeeded(), ${{ parameters.condition }})
-
   - task: PowerShell@2
     displayName: Define ImageBuilder Command Variables
     condition: and(succeeded(), ${{ parameters.condition }})
     inputs:
       targetType: 'inline'
       script: |
-        $imageBuilderImageName = "$(imageNames.imageBuilder.withrepo)"
-        Write-Host "##vso[task.setvariable variable=imageBuilderImageName]$imageBuilderImageName"
+        $tokenHostPath = '$(Agent.TempDirectory)'
+        $tokenHostFilePath = "${tokenHostPath}/token"
+        $tokenContainerPath = "/tmp"
+        $tokenContainerFilePath = "${tokenContainerPath}/token"
 
         $dockerRunBaseCmd = @(
           "docker run --rm"
@@ -59,10 +58,10 @@ steps:
         )
 
         $authedDockerRunArgs = @(
-          '-e'
-          'SYSTEM_ACCESSTOKEN=$env:SYSTEM_ACCESSTOKEN'
-          '-e'
-          'SYSTEM_OIDCREQUESTURI=$env:SYSTEM_OIDCREQUESTURI'
+          '-e AZURE_TENANT_ID=$env:tenantId'
+          '-e AZURE_CLIENT_ID=$env:servicePrincipalId'
+          "-e AZURE_FEDERATED_TOKEN_FILE=$tokenContainerFilePath"
+          "-v ${tokenHostPath}:${tokenContainerPath}"
         )
 
         $dockerRunCmd = $dockerRunBaseCmd + $dockerRunArgs
@@ -73,6 +72,7 @@ steps:
 
         Write-Host "##vso[task.setvariable variable=runImageBuilderCmd]$runImageBuilderCmd"
         Write-Host "##vso[task.setvariable variable=runAuthedImageBuilderCmd]$runAuthedImageBuilderCmd"
+        Write-Host "##vso[task.setvariable variable=tokenHostFilePath]$tokenHostFilePath"
 
   ################################################################################
   # Setup Test Runner (Optional)
diff --git a/eng/common/templates/steps/init-docker-windows.yml b/eng/common/templates/steps/init-docker-windows.yml
@@ -43,6 +43,20 @@ steps:
     inputs:
       targetType: 'inline'
       script: |
+        $tokenHostPath = '$(Agent.TempDirectory)'
+        $tokenHostFilePath = "$tokenHostPath\token"
+
         $runImageBuilderCmd = "$(Build.BinariesDirectory)\.Microsoft.DotNet.ImageBuilder\Microsoft.DotNet.ImageBuilder.exe"
+
+        $authedImageBuilderCmds = @(
+          '$env:AZURE_TENANT_ID = $env:tenantId'
+          '$env:AZURE_CLIENT_ID = $env:servicePrincipalId'
+          '$env:AZURE_FEDERATED_TOKEN_FILE = ' + "'" + "$tokenHostFilePath" + "'"
+          $runImageBuilderCmd
+        )
+
+        $runAuthedImageBuilderCmd = $($authedImageBuilderCmds -join "; ")
+
         Write-Host "##vso[task.setvariable variable=runImageBuilderCmd]$runImageBuilderCmd"
-        Write-Host "##vso[task.setvariable variable=runAuthedImageBuilderCmd]$runImageBuilderCmd"
+        Write-Host "##vso[task.setvariable variable=runAuthedImageBuilderCmd]$runAuthedImageBuilderCmd"
+        Write-Host "##vso[task.setvariable variable=tokenHostFilePath]$tokenHostFilePath"
diff --git a/eng/common/templates/steps/run-imagebuilder.yml b/eng/common/templates/steps/run-imagebuilder.yml
diff --git a/eng/common/templates/steps/test-images-linux-client.yml b/eng/common/templates/steps/test-images-linux-client.yml
diff --git a/eng/common/templates/steps/test-images-windows-client.yml b/eng/common/templates/steps/test-images-windows-client.yml
diff --git a/eng/common/templates/steps/wait-for-mcr-doc-ingestion.yml b/eng/common/templates/steps/wait-for-mcr-doc-ingestion.yml
diff --git a/eng/common/templates/steps/wait-for-mcr-image-ingestion.yml b/eng/common/templates/steps/wait-for-mcr-image-ingestion.yml
diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
