Merge pull request #293 from StefanScherer/docker-20.10.6

Update Docker 20.10.6
StefanScherer · Apr 21, 2021 · 594f9bc · 594f9bc
2 parents 09727d8 + 511b69d
commit 594f9bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/scripts/docker/install-docker.ps1 b/scripts/docker/install-docker.ps1
@@ -1,6 +1,6 @@
 # use docker_provider:  "ee", "ce", "master" or ""
-$docker_provider = "ee"
-$docker_version = "18.09.9"
+$docker_provider = "ce"
+$docker_version = "20.10.6"
 if (Test-Path env:docker_provider) {
   $docker_provider = $env:docker_provider
 }
@@ -10,7 +10,7 @@ if (Test-Path env:docker_version) {
 
 $ProgressPreference = 'SilentlyContinue'
 if ($docker_provider -eq "ce") {
-  $zip_url = $("https://download.docker.com/win/static/edge/x86_64/docker-{0}-ce.zip" -f $docker_version)
+  $zip_url = $("https://download.docker.com/win/static/stable/x86_64/docker-{0}.zip" -f $docker_version)
 }
 elseif ($docker_provider -eq "master") {
   $docker_version = "master"

diff --git a/windows_2019_docker.json b/windows_2019_docker.json
@@ -236,8 +236,8 @@
     "disk_type_id": "1",
     "memory": "2048",
     "docker_images": "mcr.microsoft.com/windows/nanoserver:1809 mcr.microsoft.com/windows/servercore:ltsc2019 mcr.microsoft.com/windows/servercore:1809 mcr.microsoft.com/windows:1809",
-    "docker_provider": "ee",
-    "docker_version": "20.10.0",
+    "docker_provider": "ce",
+    "docker_version": "20.10.6",
     "headless": "false",
     "iso_checksum": "sha256:549bca46c055157291be6c22a3aaaed8330e78ef4382c99ee82c896426a1cee1",
     "iso_url": "https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso",