[main] Update common Docker engineering infrastructure with latest (#3970)

Update common Docker engineering infrastructure with latest

Author: dotnet-docker-bot

eng/common/templates/jobs/build-images.yml

@@ -84,7 +84,13 @@ jobs:
     condition: eq(variables.imageBuilderBuildArgs, '')
     displayName: Initialize Image Builder Build Args
   - powershell: |
-      $imageBuilderBuildArgs = "$(imageBuilderBuildArgs) $(imageBuilder.queueArgs) --image-info-output-path $(artifactsPath)/$(legName)-image-info.json"
+      # Reference the existing imageBuilderBuildArgs variable as an environment variable rather than injecting it directly
+      # with the $(imageBuilderBuildArgs) syntax. This is to avoid issues where the string may contain single quotes $ chars
+      # which really mess up assigning to a variable. It would require assigning the string with single quotes but also needing
+      # to escape the single quotes that are in the string which would need to be done outside the context of PowerShell. Since
+      # all we need is for that value to be in a PowerShell variable, we can get that by the fact that AzDO automatically creates
+      # the environment variable for us.
+      $imageBuilderBuildArgs = "$env:IMAGEBUILDERBUILDARGS $(imageBuilder.queueArgs) --image-info-output-path $(artifactsPath)/$(legName)-image-info.json"
       if ($env:SYSTEM_TEAMPROJECT -eq "${{ parameters.internalProjectName }}") {
         $imageBuilderBuildArgs = "$imageBuilderBuildArgs --registry-override $(acr.server) --repo-prefix $(stagingRepoPrefix) --source-repo-prefix $(mirrorRepoPrefix) --push --registry-creds ""$(acr.server)=$(acr.userName);$(acr.password)"""
       }

eng/common/templates/jobs/copy-base-images.yml

@@ -3,12 +3,14 @@ parameters:
   pool: {}
   additionalOptions: null
   publicProjectName: null
+  customInitSteps: []
 
 jobs:
 - job: ${{ parameters.name }}
   pool: ${{ parameters.pool }}
   steps:
   - template: ../steps/init-docker-linux.yml
+  - ${{ parameters.customInitSteps }}
   - template: ../steps/copy-base-images.yml
     parameters:
       additionalOptions: ${{ parameters.additionalOptions }}

eng/common/templates/stages/build-test-publish-repo.yml

@@ -3,6 +3,7 @@ parameters:
   testMatrixType: platformVersionedOs
   buildMatrixCustomBuildLegGroupArgs: ""
   testMatrixCustomBuildLegGroupArgs: ""
+  customCopyBaseImagesInitSteps: []
   customBuildInitSteps: []
   customTestInitSteps: []
   customPublishInitSteps: []
@@ -70,6 +71,7 @@ stages:
       pool: ${{ parameters.linuxAmd64Pool }}
       additionalOptions: "--manifest '$(manifest)' $(manifestVariables)"
       publicProjectName: ${{ parameters.publicProjectName }}
+      customInitSteps: ${{ parameters.customCopyBaseImagesInitSteps}}
   - template: ../jobs/generate-matrix.yml
     parameters:
       matrixType: ${{ parameters.buildMatrixType }}

eng/common/templates/stages/dotnet/build-test-publish-repo.yml

@@ -7,6 +7,7 @@ parameters:
   publicProjectName: null
   buildMatrixCustomBuildLegGroupArgs: ""
   testMatrixCustomBuildLegGroupArgs: ""
+  customCopyBaseImagesInitSteps: []
   customBuildInitSteps: []
   customTestInitSteps: []
   customPublishInitSteps: []
@@ -25,6 +26,7 @@ stages:
     publicProjectName: ${{ parameters.publicProjectName }}
     buildMatrixCustomBuildLegGroupArgs: ${{ parameters.buildMatrixCustomBuildLegGroupArgs }}
     testMatrixCustomBuildLegGroupArgs: ${{ parameters.testMatrixCustomBuildLegGroupArgs }}
+    customCopyBaseImagesInitSteps: ${{ parameters.customCopyBaseImagesInitSteps}}
     customBuildInitSteps: ${{ parameters.customBuildInitSteps }}
     customTestInitSteps: ${{ parameters.customTestInitSteps }}
     customPublishInitSteps:

eng/common/templates/steps/copy-base-images.yml

@@ -15,6 +15,7 @@ steps:
     '$(acr.subscription)'
     '$(acr.resourceGroup)'
     $(dockerHubRegistryCreds)
+    $(customCopyBaseImagesArgs)
     --repo-prefix $(mirrorRepoPrefix)
     --registry-override '$(acr.server)'
     --os-type 'linux'

eng/common/templates/variables/common.yml

@@ -38,6 +38,8 @@ variables:
   value: ""
 - name: testRunner.options
   value: ""
+- name: customCopyBaseImagesArgs
+  value: ""
 
 - name: defaultLinuxAmd64PoolImage
   value: ubuntu-latest

eng/common/templates/variables/docker-images.yml

@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilder: mcr.microsoft.com/dotnet-buildtools/image-builder:1916215
+  imageNames.imageBuilder: mcr.microsoft.com/dotnet-buildtools/image-builder:1925523
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
   imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-buster-slim-docker-testrunner-974165
   imageNames.testRunner.withrepo: testrunner-withrepo:$(Build.BuildId)-$(System.JobId)