From 511b69d559ac008b727fef139403b16e0ccf8e45 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Wed, 21 Apr 2021 21:36:52 +0200 Subject: [PATCH] Update Docker 20.10.6 --- scripts/docker/install-docker.ps1 | 6 +++--- windows_2019_docker.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/docker/install-docker.ps1 b/scripts/docker/install-docker.ps1 index 49916571..b47bcca3 100644 --- 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 index bcf1cd3f..cf92c455 100644 --- 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",