From 0c3f2ac159d715800936d481bed2b6b25f8c2aff Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Tue, 29 Sep 2020 10:57:30 +0300
Subject: [PATCH] moved the list of docker images to toolset

---
 .../scripts/Installers/Update-DockerImages.ps1  | 17 +++--------------
 images/win/toolsets/toolset-2016.json           |  9 +++++++++
 images/win/toolsets/toolset-2019.json           |  9 +++++++++
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/images/win/scripts/Installers/Update-DockerImages.ps1 b/images/win/scripts/Installers/Update-DockerImages.ps1
index d1a689d45..ec5df1b4a 100644
--- a/images/win/scripts/Installers/Update-DockerImages.ps1
+++ b/images/win/scripts/Installers/Update-DockerImages.ps1
@@ -16,18 +16,7 @@ function DockerPull {
     }
 }
 
-if (Test-IsWin16) {
-  DockerPull mcr.microsoft.com/windows/servercore:ltsc2016
-  DockerPull mcr.microsoft.com/windows/nanoserver:10.0.14393.953
-  DockerPull mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016
-  DockerPull mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016
+$dockerToolset = (Get-ToolsetContent).docker
+foreach($dockerImage in $dockerToolset.images) {
+  DockerPull $dockerImage
 }
-
-if (Test-IsWin19) {
-  DockerPull mcr.microsoft.com/windows/servercore:ltsc2019
-  DockerPull mcr.microsoft.com/windows/nanoserver:1809
-  DockerPull mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019
-  DockerPull mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019
-}
-
-DockerPull microsoft/aspnetcore-build:1.0-2.0
diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json
index 856df7527..c3702c599 100644
--- a/images/win/toolsets/toolset-2016.json
+++ b/images/win/toolsets/toolset-2016.json
@@ -231,5 +231,14 @@
         ],
         "vsix": [
         ]
+    },
+    "docker": {
+        "images": [
+            "mcr.microsoft.com/windows/servercore:ltsc2016",
+            "mcr.microsoft.com/windows/nanoserver:10.0.14393.953",
+            "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2016",
+            "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2016",
+            "microsoft/aspnetcore-build:1.0-2.0"
+        ]
     }
 }
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 20f05bf87..f431836f6 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -283,5 +283,14 @@
                 "id": "VSInstallerProjects"
             }
         ]
+    },
+    "docker": {
+        "images": [
+            "mcr.microsoft.com/windows/servercore:ltsc2019",
+            "mcr.microsoft.com/windows/nanoserver:1809",
+            "mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019",
+            "mcr.microsoft.com/dotnet/framework/runtime:4.8-windowsservercore-ltsc2019",
+            "microsoft/aspnetcore-build:1.0-2.0"
+        ]
     }
 }