Update docker

[tianon]

Changes:

• docker-library/docker@279ba9c: Update 20.10 to 20.10.7
• docker-library/docker@271f58a: Merge pull request Windows update docker#311 from krystofwoldrich/windows-update
• docker-library/docker@01ecb28: Add back Windows variant

[github-actions]

Diff for 25a7afd:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7271a1f..1c98f4f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -20,21 +20,28 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8
 GitCommit: 12d1c2763b54d29137ec448a3e4ad1a9aefae1a0
 Directory: 19.03/git
 
-Tags: 20.10.6, 20.10, 20, latest
+Tags: 20.10.7, 20.10, 20, latest
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: f6a0c427f0354dcf5870c430c72c8f1d6b4e6d5e
+GitCommit: 279ba9c93e8e26a15171645bd511ea8476c4706e
 Directory: 20.10
 
-Tags: 20.10.6-dind, 20.10-dind, 20-dind, dind
+Tags: 20.10.7-dind, 20.10-dind, 20-dind, dind
 Architectures: amd64, arm32v6, arm32v7, arm64v8
 GitCommit: 30d7b9bf7663c96fcd888bd75e9aaa547a808a23
 Directory: 20.10/dind
 
-Tags: 20.10.6-dind-rootless, 20.10-dind-rootless, 20-dind-rootless, dind-rootless
-GitCommit: f6a0c427f0354dcf5870c430c72c8f1d6b4e6d5e
+Tags: 20.10.7-dind-rootless, 20.10-dind-rootless, 20-dind-rootless, dind-rootless
+GitCommit: 279ba9c93e8e26a15171645bd511ea8476c4706e
 Directory: 20.10/dind-rootless
 
-Tags: 20.10.6-git, 20.10-git, 20-git, git
+Tags: 20.10.7-git, 20.10-git, 20-git, git
 Architectures: amd64, arm32v6, arm32v7, arm64v8
 GitCommit: 387e351394bfad74bceebf8303c6c8e39c3d4ed4
 Directory: 20.10/git
+
+Tags: 20.10.7-windowsservercore-1809, 20.10-windowsservercore-1809, 20-windowsservercore-1809, windowsservercore-1809
+SharedTags: 20.10.7-windowsservercore, 20.10-windowsservercore, 20-windowsservercore, windowsservercore
+Architectures: windows-amd64
+GitCommit: 279ba9c93e8e26a15171645bd511ea8476c4706e
+Directory: 20.10/windows/windowsservercore-1809
+Constraints: windowsservercore-1809
diff --git a/_bashbrew-list b/_bashbrew-list
index dacf307..cc0b72f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,15 +14,23 @@ docker:20
 docker:20-dind
 docker:20-dind-rootless
 docker:20-git
+docker:20-windowsservercore
+docker:20-windowsservercore-1809
 docker:20.10
 docker:20.10-dind
 docker:20.10-dind-rootless
 docker:20.10-git
-docker:20.10.6
-docker:20.10.6-dind
-docker:20.10.6-dind-rootless
-docker:20.10.6-git
+docker:20.10-windowsservercore
+docker:20.10-windowsservercore-1809
+docker:20.10.7
+docker:20.10.7-dind
+docker:20.10.7-dind-rootless
+docker:20.10.7-git
+docker:20.10.7-windowsservercore
+docker:20.10.7-windowsservercore-1809
 docker:dind
 docker:dind-rootless
 docker:git
 docker:latest
+docker:windowsservercore
+docker:windowsservercore-1809
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 8aa0c65..660b223 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -24,7 +24,7 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.6.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.7.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_latest/Dockerfile b/docker_latest/Dockerfile
index c2828e2..c56ad6d 100644
--- a/docker_latest/Dockerfile
+++ b/docker_latest/Dockerfile
@@ -17,7 +17,7 @@ RUN apk add --no-cache \
 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
 RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 
-ENV DOCKER_VERSION 20.10.6
+ENV DOCKER_VERSION 20.10.7
 # TODO ENV DOCKER_SHA256
 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
 # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)
@@ -27,16 +27,16 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.6.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.7.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-20.10.6.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armel/docker-20.10.7.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.6.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.7.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.6.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.7.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
new file mode 100644
index 0000000..159898e
--- /dev/null
+++ b/docker_windowsservercore-1809/Dockerfile
@@ -0,0 +1,40 @@
+#
+# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
+#
+# PLEASE DO NOT EDIT IT DIRECTLY.
+#
+
+FROM mcr.microsoft.com/windows/servercore:1809
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+# PATH isn't actually set in the Docker image, so we have to set it from within the container
+RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
+	Write-Host ('Updating PATH: {0}' -f $newPath); \
+	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
+# doing this first to share cache across versions more aggressively
+
+ENV DOCKER_VERSION 20.10.7
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.7.zip
+# TODO ENV DOCKER_SHA256
+# https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
+# (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)
+
+RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \
+	Invoke-WebRequest -Uri $env:DOCKER_URL -OutFile 'docker.zip'; \
+	\
+	Write-Host 'Expanding ...'; \
+	Expand-Archive docker.zip -DestinationPath $env:ProgramFiles; \
+# (this archive has a "docker/..." directory in it already)
+	\
+	Write-Host 'Removing ...'; \
+	Remove-Item @( \
+			'docker.zip', \
+			('{0}\docker\dockerd.exe' -f $env:ProgramFiles) \
+		) -Force; \
+	\
+	Write-Host 'Verifying install ("docker --version") ...'; \
+	docker --version; \
+	\
+	Write-Host 'Complete.';