[master] Update common Docker engineering infrastructure with latest (d…

…otnet#2408)
MichaelSimons · Nov 25, 2020 · e46cb4f · e46cb4f
1 parent 0c3cedc
commit e46cb4f
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 47 deletions.
diff --git a/README.aspnet.md b/README.aspnet.md
@@ -87,41 +87,45 @@ Tags | Dockerfile | OS Version
 2.1.23-focal-arm32v7, 2.1-focal-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 2.1.23-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
-## Windows Server, version 2009 amd64 Tags
+## Nano Server, version 2009 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.0-nanoserver-2009, 5.0-nanoserver-2009, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-2009/amd64/Dockerfile)
 3.1.10-nanoserver-2009, 3.1-nanoserver-2009, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-2009/amd64/Dockerfile)
 2.1.23-nanoserver-2009, 2.1-nanoserver-2009, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-2009/amd64/Dockerfile)
 
-## Windows Server, version 2004 amd64 Tags
+## Nano Server, version 2004 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.0-nanoserver-2004, 5.0-nanoserver-2004, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-2004/amd64/Dockerfile)
 3.1.10-nanoserver-2004, 3.1-nanoserver-2004, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-2004/amd64/Dockerfile)
 2.1.23-nanoserver-2004, 2.1-nanoserver-2004, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-2004/amd64/Dockerfile)
 
-## Windows Server, version 1909 amd64 Tags
+## Nano Server, version 1909 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.0-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-1909/amd64/Dockerfile)
 3.1.10-nanoserver-1909, 3.1-nanoserver-1909, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-1909/amd64/Dockerfile)
 2.1.23-nanoserver-1909, 2.1-nanoserver-1909, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-1909/amd64/Dockerfile)
 
-## Windows Server, version 1903 amd64 Tags
+## Nano Server, version 1903 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 3.1.10-nanoserver-1903, 3.1-nanoserver-1903, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-1903/amd64/Dockerfile)
 2.1.23-nanoserver-1903, 2.1-nanoserver-1903, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-1903/amd64/Dockerfile)
 
-## Windows Server 2019 amd64 Tags
+## Nano Server, version 1809 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.0-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-1809/amd64/Dockerfile)
-5.0.0-windowsservercore-ltsc2019, 5.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/windowsservercore-ltsc2019/amd64/Dockerfile)
 3.1.10-nanoserver-1809, 3.1-nanoserver-1809, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-1809/amd64/Dockerfile)
 2.1.23-nanoserver-1809, 2.1-nanoserver-1809, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-1809/amd64/Dockerfile)
 
+## Windows Server Core 2019 amd64 Tags
+Tag | Dockerfile
+---------| ---------------
+5.0.0-windowsservercore-ltsc2019, 5.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+
 You can retrieve a list of all available tags for dotnet/aspnet at https://mcr.microsoft.com/v2/dotnet/aspnet/tags/list.
 <!--End of generated tags-->
 

diff --git a/README.runtime.md b/README.runtime.md
@@ -83,41 +83,45 @@ Tags | Dockerfile | OS Version
 2.1.23-focal-arm32v7, 2.1-focal-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 2.1.23-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
-## Windows Server, version 2009 amd64 Tags
+## Nano Server, version 2009 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.0-nanoserver-2009, 5.0-nanoserver-2009, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-2009/amd64/Dockerfile)
 3.1.10-nanoserver-2009, 3.1-nanoserver-2009, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-2009/amd64/Dockerfile)
 2.1.23-nanoserver-2009, 2.1-nanoserver-2009, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-2009/amd64/Dockerfile)
 
-## Windows Server, version 2004 amd64 Tags
+## Nano Server, version 2004 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.0-nanoserver-2004, 5.0-nanoserver-2004, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-2004/amd64/Dockerfile)
 3.1.10-nanoserver-2004, 3.1-nanoserver-2004, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-2004/amd64/Dockerfile)
 2.1.23-nanoserver-2004, 2.1-nanoserver-2004, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-2004/amd64/Dockerfile)
 
-## Windows Server, version 1909 amd64 Tags
+## Nano Server, version 1909 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.0-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-1909/amd64/Dockerfile)
 3.1.10-nanoserver-1909, 3.1-nanoserver-1909, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-1909/amd64/Dockerfile)
 2.1.23-nanoserver-1909, 2.1-nanoserver-1909, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-1909/amd64/Dockerfile)
 
-## Windows Server, version 1903 amd64 Tags
+## Nano Server, version 1903 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 3.1.10-nanoserver-1903, 3.1-nanoserver-1903, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-1903/amd64/Dockerfile)
 2.1.23-nanoserver-1903, 2.1-nanoserver-1903, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-1903/amd64/Dockerfile)
 
-## Windows Server 2019 amd64 Tags
+## Nano Server, version 1809 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.0-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-1809/amd64/Dockerfile)
-5.0.0-windowsservercore-ltsc2019, 5.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/windowsservercore-ltsc2019/amd64/Dockerfile)
 3.1.10-nanoserver-1809, 3.1-nanoserver-1809, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-1809/amd64/Dockerfile)
 2.1.23-nanoserver-1809, 2.1-nanoserver-1809, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-1809/amd64/Dockerfile)
 
+## Windows Server Core 2019 amd64 Tags
+Tag | Dockerfile
+---------| ---------------
+5.0.0-windowsservercore-ltsc2019, 5.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+
 You can retrieve a list of all available tags for dotnet/runtime at https://mcr.microsoft.com/v2/dotnet/runtime/tags/list.
 <!--End of generated tags-->
 

diff --git a/README.samples.md b/README.samples.md
@@ -77,25 +77,25 @@ Tags | Dockerfile | OS Version
 dotnetapp-buster-slim-arm64v8, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile) | Debian 10
 aspnetapp-buster-slim-arm64v8, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile) | Debian 10
 
-## Windows Server, version 2009 amd64 Tags
+## Nano Server, version 2009 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 dotnetapp-nanoserver-2009, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)
 aspnetapp-nanoserver-2009, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile)
 
-## Windows Server, version 2004 amd64 Tags
+## Nano Server, version 2004 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 dotnetapp-nanoserver-2004, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)
 aspnetapp-nanoserver-2004, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile)
 
-## Windows Server, version 1909 amd64 Tags
+## Nano Server, version 1909 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 dotnetapp-nanoserver-1909, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)
 aspnetapp-nanoserver-1909, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile)
 
-## Windows Server 2019 amd64 Tags
+## Nano Server, version 1809 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 dotnetapp-nanoserver-1809, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)

diff --git a/README.sdk.md b/README.sdk.md
@@ -91,41 +91,45 @@ Tags | Dockerfile | OS Version
 2.1.811-focal-arm32v7, 2.1-focal-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 2.1.811-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
-## Windows Server, version 2009 amd64 Tags
+## Nano Server, version 2009 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.100-nanoserver-2009, 5.0-nanoserver-2009, 5.0.100, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-2009/amd64/Dockerfile)
 3.1.404-nanoserver-2009, 3.1-nanoserver-2009, 3.1.404, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-2009/amd64/Dockerfile)
 2.1.811-nanoserver-2009, 2.1-nanoserver-2009, 2.1.811, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-2009/amd64/Dockerfile)
 
-## Windows Server, version 2004 amd64 Tags
+## Nano Server, version 2004 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.100-nanoserver-2004, 5.0-nanoserver-2004, 5.0.100, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-2004/amd64/Dockerfile)
 3.1.404-nanoserver-2004, 3.1-nanoserver-2004, 3.1.404, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-2004/amd64/Dockerfile)
 2.1.811-nanoserver-2004, 2.1-nanoserver-2004, 2.1.811, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-2004/amd64/Dockerfile)
 
-## Windows Server, version 1909 amd64 Tags
+## Nano Server, version 1909 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.100-nanoserver-1909, 5.0-nanoserver-1909, 5.0.100, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-1909/amd64/Dockerfile)
 3.1.404-nanoserver-1909, 3.1-nanoserver-1909, 3.1.404, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-1909/amd64/Dockerfile)
 2.1.811-nanoserver-1909, 2.1-nanoserver-1909, 2.1.811, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-1909/amd64/Dockerfile)
 
-## Windows Server, version 1903 amd64 Tags
+## Nano Server, version 1903 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 3.1.404-nanoserver-1903, 3.1-nanoserver-1903, 3.1.404, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-1903/amd64/Dockerfile)
 2.1.811-nanoserver-1903, 2.1-nanoserver-1903, 2.1.811, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-1903/amd64/Dockerfile)
 
-## Windows Server 2019 amd64 Tags
+## Nano Server, version 1809 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
 5.0.100-nanoserver-1809, 5.0-nanoserver-1809, 5.0.100, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-1809/amd64/Dockerfile)
-5.0.100-windowsservercore-ltsc2019, 5.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/windowsservercore-ltsc2019/amd64/Dockerfile)
 3.1.404-nanoserver-1809, 3.1-nanoserver-1809, 3.1.404, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-1809/amd64/Dockerfile)
 2.1.811-nanoserver-1809, 2.1-nanoserver-1809, 2.1.811, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-1809/amd64/Dockerfile)
 
+## Windows Server Core 2019 amd64 Tags
+Tag | Dockerfile
+---------| ---------------
+5.0.100-windowsservercore-ltsc2019, 5.0-windowsservercore-ltsc2019 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/windowsservercore-ltsc2019/amd64/Dockerfile)
+
 You can retrieve a list of all available tags for dotnet/sdk at https://mcr.microsoft.com/v2/dotnet/sdk/tags/list.
 <!--End of generated tags-->
 

diff --git a/eng/common/Get-ImageBuilder.ps1 b/eng/common/Get-ImageBuilder.ps1
@@ -0,0 +1,15 @@
+#!/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
+}
+
+& docker inspect ${imageNames.imagebuilder} | Out-Null
+if ($LASTEXITCODE -ne 0) {
+    Write-Output "Pulling"
+    & $PSScriptRoot/Invoke-WithRetry.ps1 "docker pull ${imageNames.imagebuilder}"
+}
diff --git a/eng/common/Invoke-ImageBuilder.ps1 b/eng/common/Invoke-ImageBuilder.ps1
@@ -54,33 +54,17 @@ function Exec {
     }
 }
 
-function PullImageBuilder {
-    Invoke-Expression "docker inspect ${imageNames.imagebuilder} | Out-Null"
-    if ($LASTEXITCODE -ne 0) {
-        Log "Pulling"
-        ./eng/common/Invoke-WithRetry.ps1 "docker pull ${imageNames.imagebuilder}"
-    }
-}
-
 $imageBuilderContainerName = "ImageBuilder-$(Get-Date -Format yyyyMMddhhmmss)"
 $containerCreated = $false
 
 pushd $PSScriptRoot/../../
 try {
-    # Load common image names
-    Get-Content ./eng/common/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()
-    }
-
     $activeOS = docker version -f "{{ .Server.Os }}"
     if ($activeOS -eq "linux") {
         # On Linux, ImageBuilder is run within a container.
         $imageBuilderImageName = "microsoft-dotnet-imagebuilder-withrepo"
         if ($ReuseImageBuilderImage -ne $True) {
-            PullImageBuilder
+            & ./eng/common/Get-ImageBuilder.ps1
             Exec ("docker build -t $imageBuilderImageName --build-arg " `
                 + "IMAGE=${imageNames.imagebuilder} -f eng/common/Dockerfile.WithRepo .")
         }
@@ -93,7 +77,7 @@ try {
         $imageBuilderFolder = ".Microsoft.DotNet.ImageBuilder"
         $imageBuilderCmd = [System.IO.Path]::Combine($imageBuilderFolder, "Microsoft.DotNet.ImageBuilder.exe")
         if (-not (Test-Path -Path "$imageBuilderCmd" -PathType Leaf)) {
-            PullImageBuilder
+            & ./eng/common/Get-ImageBuilder.ps1
             Exec "docker create --name $imageBuilderContainerName ${imageNames.imagebuilder}"
             $containerCreated = $true
             if (Test-Path -Path $imageBuilderFolder)

diff --git a/eng/common/templates/jobs/publish.yml b/eng/common/templates/jobs/publish.yml
@@ -4,7 +4,10 @@ jobs:
 - job: Publish
   pool: ${{ parameters.pool }}
   variables:
-    imageBuilder.commonCmdArgs: >
+  - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+    - group: DotNet-AllOrgs-Darc-Pats
+  - name: imageBuilder.commonCmdArgs
+    value: >
       --manifest '$(manifest)'
       --registry-override '$(acr.server)'
       $(manifestVariables)
@@ -78,11 +81,17 @@ jobs:
       '$(dotnetDockerBot.userName)'
       '$(dotnetDockerBot.email)'
       '$(BotAccount-dotnet-docker-bot-PAT)'
+      '$(dn-bot-devdiv-dnceng-rw-code-pat)'
+      'dnceng'
+      'internal'
       --manifest '$(manifest)'
       --git-owner 'dotnet'
       --git-repo 'versions'
       --git-branch 'master'
       --git-path '$(imageInfoVersionsPath)'
+      --azdo-repo 'dotnet-versions'
+      --azdo-branch 'master'
+      --azdo-path '$(imageInfoVersionsPath)'
       $(dryRunArg)
       $(imageBuilder.commonCmdArgs)
     displayName: Publish Image Info

diff --git a/eng/common/templates/stages/build-test-publish-repo.yml b/eng/common/templates/stages/build-test-publish-repo.yml
@@ -138,14 +138,14 @@ stages:
       noCache: ${{ parameters.noCache }}
   - template: ../jobs/build-images.yml
     parameters:
-      name: Windows2009_amd64
+      name: Windows20H2_amd64
       pool:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: DotNetCore-Docker-Public
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: DotNetCore-Docker
         demands: VSTS_OS -equals Windows-ServerDatacenter-2009
-      matrix: dependencies.GenerateBuildMatrix.outputs['matrix.Windows2009Amd64']
+      matrix: dependencies.GenerateBuildMatrix.outputs['matrix.Windows20H2Amd64']
       dockerClientOS: windows
       buildJobTimeout: ${{ parameters.windowsAmdBuildJobTimeout }}
       customInitSteps: ${{ parameters.customBuildInitSteps }}
@@ -257,11 +257,11 @@ stages:
         testJobTimeout: ${{ parameters.windowsAmdTestJobTimeout }}
     - template: ../jobs/test-images-windows-client.yml
       parameters:
-        name: Windows2009_amd64
+        name: Windows20H2_amd64
         pool:
           name: DotNetCore-Docker
           demands: VSTS_OS -equals Windows-ServerDatacenter-2009
-        matrix: dependencies.GenerateTestMatrix.outputs['matrix.Windows2009Amd64']
+        matrix: dependencies.GenerateTestMatrix.outputs['matrix.Windows20H2Amd64']
         testJobTimeout: ${{ parameters.windowsAmdTestJobTimeout }}
     - template: ../jobs/test-images-windows-client.yml
       parameters:

diff --git a/eng/common/templates/variables/common-paths.yml b/eng/common/templates/variables/common-paths.yml
@@ -3,4 +3,3 @@ variables:
   engCommonPath: $(Build.Repository.LocalPath)/$(engCommonRelativePath)
   engPath: $(Build.Repository.LocalPath)/eng
   testScriptPath: ./tests/run-tests.ps1
-  testResultsDirectory: tests/Microsoft.DotNet.Docker.Tests/TestResults/
diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml
@@ -1,5 +1,5 @@
 variables:
-  imageNames.imageBuilder: mcr.microsoft.com/dotnet-buildtools/image-builder:884052
+  imageNames.imageBuilder: mcr.microsoft.com/dotnet-buildtools/image-builder:898723
   imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
   imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-slim-docker-testrunner-690072
   imageNames.testRunner.withrepo: testrunner-withrepo:$(Build.BuildId)-$(System.JobId)