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

Update common Docker engineering infrastructure with latest

Author: dotnet-docker-bot

eng/common/Get-ImageBuilder.ps1

@@ -1,15 +1,13 @@
 #!/usr/bin/env pwsh
 
 # Load common image names
-Get-Content $PSScriptRoot/templates/variables/docker-images.yml |
-Where-Object { $_.Trim() -notlike 'variables:' } |
-ForEach-Object { 
-    $parts = $_.Split(':', 2)
-    Set-Variable -Name $parts[0].Trim() -Value $parts[1].Trim() -Scope Global
+$imageNameVars = & $PSScriptRoot/Get-ImageNameVars.ps1
+foreach ($varName in $imageNameVars.Keys) { 
+    Set-Variable -Name $varName -Value $imageNameVars[$varName] -Scope Global
 }
 
-& docker inspect ${imageNames.imagebuilder} | Out-Null
+& docker inspect ${imageNames.imagebuilderName} | Out-Null
 if (-not $?) {
     Write-Output "Pulling"
-    & $PSScriptRoot/Invoke-WithRetry.ps1 "docker pull ${imageNames.imagebuilder}"
+    & $PSScriptRoot/Invoke-WithRetry.ps1 "docker pull ${imageNames.imagebuilderName}"
 }

eng/common/Get-ImageNameVars.ps1

@@ -0,0 +1,12 @@
+# Returns a hashtable of variable name-to-value mapping representing the image name variables
+# used by the common build infrastructure.
+
+$vars = @{}
+Get-Content $PSScriptRoot/templates/variables/docker-images.yml |
+    Where-Object { $_.Trim().Length -gt 0 -and $_.Trim() -notlike 'variables:' -and $_.Trim() -notlike '# *' } |
+    ForEach-Object {
+        $parts = $_.Split(':', 2)
+        $vars[$parts[0].Trim()] = $parts[1].Trim()
+    }
+
+return $vars

eng/common/Install-DotNetSdk.ps1

@@ -40,14 +40,16 @@ if (!(Test-Path $DotnetInstallScriptPath)) {
     & "$PSScriptRoot/Invoke-WithRetry.ps1" "Invoke-WebRequest 'https://dot.net/v1/$DotnetInstallScript' -OutFile $DotnetInstallScriptPath"
 }
 
+$DotnetChannel = "6.0"
+
 $InstallFailed = $false
 if ($IsRunningOnUnix) {
     & chmod +x $DotnetInstallScriptPath
-    & $DotnetInstallScriptPath --version "latest" --install-dir $InstallPath
+    & $DotnetInstallScriptPath --channel $DotnetChannel --install-dir $InstallPath
     $InstallFailed = ($LASTEXITCODE -ne 0)
 }
 else {
-    & $DotnetInstallScriptPath -Version "latest" -InstallDir $InstallPath
+    & $DotnetInstallScriptPath -Channel $DotnetChannel -InstallDir $InstallPath
     $InstallFailed = (-not $?)
 }
 

eng/common/Invoke-CleanupDocker.ps1

@@ -7,16 +7,14 @@ docker volume prune -f
 
 # Preserve the tagged Windows base images and the common eng infra images (e.g. ImageBuilder)
 # to avoid the expense of having to repull continuously.
-$engInfraImages = Get-Content $PSScriptRoot/templates/variables/docker-images.yml |
-    Where-Object { $_.Trim() -notlike 'variables:' } |
-    ForEach-Object { $_.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)[1] }
+$imageNameVars = & $PSScriptRoot/Get-ImageNameVars.ps1
 
-docker images --format "{{.Repository}}:{{.Tag}} {{.ID}}"|
+docker images --format "{{.Repository}}:{{.Tag}} {{.ID}}" |
     Where-Object {
         $localImage = $_
         $localImage.Contains(":<none> ")`
         -Or -Not ($localImage.StartsWith("mcr.microsoft.com/windows")`
-            -Or ($engInfraImages.Where({ $localImage.StartsWith($_) }, 'First').Count -gt 0)) } |
+            -Or ($imageNameVars.Values.Where({ $localImage.StartsWith($_) }, 'First').Count -gt 0)) } |
     ForEach-Object { $_.Split(' ', [System.StringSplitOptions]::RemoveEmptyEntries)[1] } |
     Select-Object -Unique |
     ForEach-Object { docker rmi -f $_ }

eng/common/Invoke-ImageBuilder.ps1

@@ -66,7 +66,7 @@ try {
         if ($ReuseImageBuilderImage -ne $True) {
             & ./eng/common/Get-ImageBuilder.ps1
             Exec ("docker build -t $imageBuilderImageName --build-arg " `
-                + "IMAGE=${imageNames.imagebuilder} -f eng/common/Dockerfile.WithRepo .")
+                + "IMAGE=${imageNames.imageBuilderName} -f eng/common/Dockerfile.WithRepo .")
         }
 
         $imageBuilderCmd = "docker run --name $imageBuilderContainerName -v /var/run/docker.sock:/var/run/docker.sock $imageBuilderImageName"
@@ -78,7 +78,7 @@ try {
         $imageBuilderCmd = [System.IO.Path]::Combine($imageBuilderFolder, "Microsoft.DotNet.ImageBuilder.exe")
         if (-not (Test-Path -Path "$imageBuilderCmd" -PathType Leaf)) {
             & ./eng/common/Get-ImageBuilder.ps1
-            Exec "docker create --name $imageBuilderContainerName ${imageNames.imagebuilder}"
+            Exec "docker create --name $imageBuilderContainerName ${imageNames.imageBuilderName}"
             $containerCreated = $true
             if (Test-Path -Path $imageBuilderFolder)
             {

eng/common/templates/steps/test-images-linux-client.yml

@@ -20,7 +20,7 @@ steps:
       optionalTestArgs="$optionalTestArgs -TestCategories pre-build"
     else
       if [ "${{ variables['System.TeamProject'] }}" == "${{ parameters.internalProjectName }}" ] && [ "${{ variables['Build.Reason'] }}" != "PullRequest" ]; then
-        optionalTestArgs="$optionalTestArgs -PullImages -Registry $(acr.server) -RepoPrefix $(stagingRepoPrefix) -ImageInfoPath $(artifactsPath)/image-info/image-info.json"
+        optionalTestArgs="$optionalTestArgs -PullImages -Registry $(acr.server) -RepoPrefix $(stagingRepoPrefix) -ImageInfoPath $(artifactsPath)/image-info.json"
       fi
       if [ "$REPOTESTARGS" != "" ]; then
         optionalTestArgs="$optionalTestArgs $REPOTESTARGS"
@@ -49,6 +49,7 @@ steps:
     - template: ../steps/download-build-artifact.yml
       parameters:
         targetPath: $(Build.ArtifactStagingDirectory)
+        artifactName: image-info
         condition: ${{ parameters.condition }}
 - template: parse-test-arg-arrays.yml
 - powershell: >

eng/common/templates/steps/test-images-windows-client.yml

@@ -17,7 +17,7 @@ steps:
 - ${{ parameters.customInitSteps }}
 - powershell: |
     if ("${{ variables['System.TeamProject'] }}" -eq "${{ parameters.internalProjectName }}" -and "${{ variables['Build.Reason'] }}" -ne "PullRequest") {
-      $optionalTestArgs="$optionalTestArgs -PullImages -Registry $env:ACR_SERVER -RepoPrefix $env:STAGINGREPOPREFIX -ImageInfoPath $(artifactsPath)/image-info/image-info.json"
+      $optionalTestArgs="$optionalTestArgs -PullImages -Registry $env:ACR_SERVER -RepoPrefix $env:STAGINGREPOPREFIX -ImageInfoPath $(artifactsPath)/image-info.json"
     } 
     if ($env:REPOTESTARGS) {
       $optionalTestArgs += " $env:REPOTESTARGS"
@@ -32,6 +32,7 @@ steps:
   - template: ../steps/download-build-artifact.yml
     parameters:
       targetPath: $(Build.ArtifactStagingDirectory)
+      artifactName: image-info
       condition: ${{ parameters.condition }}
 - template: parse-test-arg-arrays.yml
 - powershell: >

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

@@ -1,5 +1,6 @@
 variables:
-  imageNames.imageBuilder: mcr.microsoft.com/dotnet-buildtools/image-builder:2017609
+  imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2057093
+  imageNames.imageBuilder: $(imageNames.imageBuilderName)
   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)