Selaa lähdekoodia

Run update.sh

Docker Library Bot 8 vuotta sitten
vanhempi
sitoutus
d6c8877ca5
8 muutettua tiedostoa jossa 120 lisäystä ja 110 poistoa
  1. 13 25
      docker/README.md
  2. 2 2
      ghost/README.md
  3. 18 15
      golang/README.md
  4. 11 9
      haproxy/README.md
  5. 7 4
      hello-world/README.md
  6. 25 25
      mongo/README.md
  7. 19 13
      openjdk/README.md
  8. 25 17
      python/README.md

+ 13 - 25
docker/README.md

@@ -16,17 +16,22 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`17.11.0-ce-rc4`, `17.11-rc`, `rc`, `test` (*17.11-rc/Dockerfile*)](https://github.com/docker-library/docker/blob/51a40fb6eed136282edaf32f45d469ac2c5fb6e4/17.11-rc/Dockerfile)
--	[`17.11.0-ce-rc4-dind`, `17.11-rc-dind`, `rc-dind`, `test-dind` (*17.11-rc/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/6e7677bec19c214ef5445c0d2b96c56e42098ca1/17.11-rc/dind/Dockerfile)
--	[`17.11.0-ce-rc4-git`, `17.11-rc-git`, `rc-git`, `test-git` (*17.11-rc/git/Dockerfile*)](https://github.com/docker-library/docker/blob/6e7677bec19c214ef5445c0d2b96c56e42098ca1/17.11-rc/git/Dockerfile)
--	[`17.10.0-ce`, `17.10.0`, `17.10`, `17`, `edge`, `latest` (*17.10/Dockerfile*)](https://github.com/docker-library/docker/blob/af5b6cd45b8d1aeb534589d99f92b5a4dc886f5d/17.10/Dockerfile)
--	[`17.10.0-ce-dind`, `17.10.0-dind`, `17.10-dind`, `17-dind`, `edge-dind`, `dind` (*17.10/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/00de5231b507c989ce900df2ef3f1abf4ce7e19c/17.10/dind/Dockerfile)
--	[`17.10.0-ce-git`, `17.10.0-git`, `17.10-git`, `17-git`, `edge-git`, `git` (*17.10/git/Dockerfile*)](https://github.com/docker-library/docker/blob/62a456489acfe7443d426cd502ccf22130d1ccf9/17.10/git/Dockerfile)
--	[`17.10.0-ce-windowsservercore`, `17.10.0-windowsservercore`, `17.10-windowsservercore`, `17-windowsservercore`, `edge-windowsservercore`, `windowsservercore` (*17.10/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/docker/blob/62a456489acfe7443d426cd502ccf22130d1ccf9/17.10/windows/windowsservercore/Dockerfile)
+## Simple Tags
+
+-	[`17.11.0-ce`, `17.11.0`, `17.11`, `17`, `edge`, `test`, `latest` (*17.11/Dockerfile*)](https://github.com/docker-library/docker/blob/64f6d5eba928dd79b9ca1e7e879021a2baf4c705/17.11/Dockerfile)
+-	[`17.11.0-ce-dind`, `17.11.0-dind`, `17.11-dind`, `17-dind`, `edge-dind`, `test-dind`, `dind` (*17.11/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/64f6d5eba928dd79b9ca1e7e879021a2baf4c705/17.11/dind/Dockerfile)
+-	[`17.11.0-ce-git`, `17.11.0-git`, `17.11-git`, `17-git`, `edge-git`, `test-git`, `git` (*17.11/git/Dockerfile*)](https://github.com/docker-library/docker/blob/64f6d5eba928dd79b9ca1e7e879021a2baf4c705/17.11/git/Dockerfile)
 -	[`17.09.0-ce`, `17.09.0`, `17.09`, `stable` (*17.09/Dockerfile*)](https://github.com/docker-library/docker/blob/af5b6cd45b8d1aeb534589d99f92b5a4dc886f5d/17.09/Dockerfile)
 -	[`17.09.0-ce-dind`, `17.09.0-dind`, `17.09-dind`, `stable-dind` (*17.09/dind/Dockerfile*)](https://github.com/docker-library/docker/blob/00de5231b507c989ce900df2ef3f1abf4ce7e19c/17.09/dind/Dockerfile)
 -	[`17.09.0-ce-git`, `17.09.0-git`, `17.09-git`, `stable-git` (*17.09/git/Dockerfile*)](https://github.com/docker-library/docker/blob/a6b52c73daa8283cd861f41f55e53426008708ac/17.09/git/Dockerfile)
--	[`17.09.0-ce-windowsservercore`, `17.09.0-windowsservercore`, `17.09-windowsservercore`, `stable-windowsservercore` (*17.09/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/docker/blob/2f6926c4fb37274b90fae3ba6c3320619a8d0289/17.09/windows/windowsservercore/Dockerfile)
+-	[`17.09.0-ce-windowsservercore-ltsc2016`, `17.09.0-windowsservercore-ltsc2016`, `17.09-windowsservercore-ltsc2016`, `stable-windowsservercore-ltsc2016` (*17.09/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/docker/blob/2aa6d388f205fc20ad22402bfed4ece715c7cb48/17.09/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`17.09.0-ce-windowsservercore-1709`, `17.09.0-windowsservercore-1709`, `17.09-windowsservercore-1709`, `stable-windowsservercore-1709` (*17.09/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/docker/blob/2aa6d388f205fc20ad22402bfed4ece715c7cb48/17.09/windows/windowsservercore-1709/Dockerfile)
+
+## Shared Tags
+
+-	`windowsservercore`:
+	-	[`17.09.0-ce-windowsservercore-ltsc2016` (*17.09/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/docker/blob/2aa6d388f205fc20ad22402bfed4ece715c7cb48/17.09/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`17.09.0-ce-windowsservercore-1709` (*17.09/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/docker/blob/2aa6d388f205fc20ad22402bfed4ece715c7cb48/17.09/windows/windowsservercore-1709/Dockerfile)
 
 # Quick reference
 
@@ -217,23 +222,6 @@ The Docker documentation is a good starting point for understanding the differen
 
 The `-v /my/own/var-lib-docker:/var/lib/docker` part of the command mounts the `/my/own/var-lib-docker` directory from the underlying host system as `/var/lib/docker` inside the container, where Docker by default will write its data files.
 
-# Image Variants
-
-The `docker` images come in many flavors, each designed for a specific use case.
-
-## `docker:<version>`
-
-This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
-
-## `docker:windowsservercore`
-
-This image is based on [Windows Server Core (`microsoft/windowsservercore`)](https://hub.docker.com/r/microsoft/windowsservercore/). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
-
-For information about how to get Docker running on Windows, please see the relevant "Quick Start" guide provided by Microsoft:
-
--	[Windows Server Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server)
--	[Windows 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
-
 # License
 
 View [license information](https://github.com/docker/docker/blob/eb7b2ed6bbe3fbef588116d362ce595d6e35fc43/LICENSE) for the software contained in this image.

+ 2 - 2
ghost/README.md

@@ -16,8 +16,8 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`1.17.3`, `1.17`, `1`, `latest` (*1/debian/Dockerfile*)](https://github.com/docker-library/ghost/blob/8ddece4dde5727e3324198d86ae565511ec2fbef/1/debian/Dockerfile)
--	[`1.17.3-alpine`, `1.17-alpine`, `1-alpine`, `alpine` (*1/alpine/Dockerfile*)](https://github.com/docker-library/ghost/blob/8ddece4dde5727e3324198d86ae565511ec2fbef/1/alpine/Dockerfile)
+-	[`1.18.0`, `1.18`, `1`, `latest` (*1/debian/Dockerfile*)](https://github.com/docker-library/ghost/blob/ab26d8e463d708c406ccd05ffc67c63215b71d1d/1/debian/Dockerfile)
+-	[`1.18.0-alpine`, `1.18-alpine`, `1-alpine`, `alpine` (*1/alpine/Dockerfile*)](https://github.com/docker-library/ghost/blob/ab26d8e463d708c406ccd05ffc67c63215b71d1d/1/alpine/Dockerfile)
 -	[`0.11.12`, `0.11`, `0` (*0/debian/Dockerfile*)](https://github.com/docker-library/ghost/blob/44dc27d05debece6a738ccbddd85d2ed4adc2eac/0/debian/Dockerfile)
 -	[`0.11.12-alpine`, `0.11-alpine`, `0-alpine` (*0/alpine/Dockerfile*)](https://github.com/docker-library/ghost/blob/44dc27d05debece6a738ccbddd85d2ed4adc2eac/0/alpine/Dockerfile)
 

+ 18 - 15
golang/README.md

@@ -20,24 +20,36 @@ WARNING:
 
 -	[`1.9.2-stretch`, `1.9-stretch`, `1-stretch`, `stretch` (*1.9/stretch/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.9/stretch/Dockerfile)
 -	[`1.9.2-alpine3.6`, `1.9-alpine3.6`, `1-alpine3.6`, `alpine3.6`, `1.9.2-alpine`, `1.9-alpine`, `1-alpine`, `alpine` (*1.9/alpine3.6/Dockerfile*)](https://github.com/docker-library/golang/blob/bb5a9205c84b1af7daea647e144f2517497cc7ef/1.9/alpine3.6/Dockerfile)
--	[`1.9.2-windowsservercore`, `1.9-windowsservercore`, `1-windowsservercore`, `windowsservercore` (*1.9/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.9/windows/windowsservercore/Dockerfile)
--	[`1.9.2-nanoserver`, `1.9-nanoserver`, `1-nanoserver`, `nanoserver` (*1.9/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.9/windows/nanoserver/Dockerfile)
+-	[`1.9.2-windowsservercore-ltsc2016`, `1.9-windowsservercore-ltsc2016`, `1-windowsservercore-ltsc2016`, `windowsservercore-ltsc2016` (*1.9/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.9/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`1.9.2-windowsservercore-1709`, `1.9-windowsservercore-1709`, `1-windowsservercore-1709`, `windowsservercore-1709` (*1.9/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.9/windows/windowsservercore-1709/Dockerfile)
+-	[`1.9.2-nanoserver-sac2016`, `1.9-nanoserver-sac2016`, `1-nanoserver-sac2016`, `nanoserver-sac2016` (*1.9/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.9/windows/nanoserver-sac2016/Dockerfile)
 -	[`1.8.5-stretch`, `1.8-stretch` (*1.8/stretch/Dockerfile*)](https://github.com/docker-library/golang/blob/87aaffce8f74bc5bee1306539030ee413c32aee4/1.8/stretch/Dockerfile)
 -	[`1.8.5-jessie`, `1.8-jessie` (*1.8/jessie/Dockerfile*)](https://github.com/docker-library/golang/blob/87aaffce8f74bc5bee1306539030ee413c32aee4/1.8/jessie/Dockerfile)
 -	[`1.8.5-alpine3.6`, `1.8-alpine3.6` (*1.8/alpine3.6/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.8/alpine3.6/Dockerfile)
 -	[`1.8.5-alpine3.5`, `1.8-alpine3.5`, `1.8.5-alpine`, `1.8-alpine` (*1.8/alpine3.5/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.8/alpine3.5/Dockerfile)
 -	[`1.8.5-onbuild`, `1.8-onbuild` (*1.8/onbuild/Dockerfile*)](https://github.com/docker-library/golang/blob/132cd70768e3bc269902e4c7b579203f66dc9f64/1.8/onbuild/Dockerfile)
--	[`1.8.5-windowsservercore`, `1.8-windowsservercore` (*1.8/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.8/windows/windowsservercore/Dockerfile)
--	[`1.8.5-nanoserver`, `1.8-nanoserver` (*1.8/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.8/windows/nanoserver/Dockerfile)
+-	[`1.8.5-windowsservercore-ltsc2016`, `1.8-windowsservercore-ltsc2016` (*1.8/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.8/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`1.8.5-windowsservercore-1709`, `1.8-windowsservercore-1709` (*1.8/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.8/windows/windowsservercore-1709/Dockerfile)
+-	[`1.8.5-nanoserver-sac2016`, `1.8-nanoserver-sac2016` (*1.8/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.8/windows/nanoserver-sac2016/Dockerfile)
 
 ## Shared Tags
 
 -	`1.9.2`, `1.9`, `1`, `latest`:
 	-	[`1.9.2-stretch` (*1.9/stretch/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.9/stretch/Dockerfile)
-	-	[`1.9.2-windowsservercore` (*1.9/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.9/windows/windowsservercore/Dockerfile)
+	-	[`1.9.2-windowsservercore-ltsc2016` (*1.9/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.9/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`1.9.2-windowsservercore-1709` (*1.9/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.9/windows/windowsservercore-1709/Dockerfile)
+-	`windowsservercore`:
+	-	[`1.9.2-windowsservercore-ltsc2016` (*1.9/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.9/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`1.9.2-windowsservercore-1709` (*1.9/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.9/windows/windowsservercore-1709/Dockerfile)
+	-	[`1.8.5-windowsservercore-ltsc2016` (*1.8/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.8/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`1.8.5-windowsservercore-1709` (*1.8/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.8/windows/windowsservercore-1709/Dockerfile)
+-	`nanoserver`:
+	-	[`1.9.2-nanoserver-sac2016` (*1.9/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.9/windows/nanoserver-sac2016/Dockerfile)
+	-	[`1.8.5-nanoserver-sac2016` (*1.8/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.8/windows/nanoserver-sac2016/Dockerfile)
 -	`1.8.5`, `1.8`:
 	-	[`1.8.5-jessie` (*1.8/jessie/Dockerfile*)](https://github.com/docker-library/golang/blob/87aaffce8f74bc5bee1306539030ee413c32aee4/1.8/jessie/Dockerfile)
-	-	[`1.8.5-windowsservercore` (*1.8/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/golang/blob/cffcff7fce7f6b6b5c82fc8f7b3331a10590a661/1.8/windows/windowsservercore/Dockerfile)
+	-	[`1.8.5-windowsservercore-ltsc2016` (*1.8/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.8/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`1.8.5-windowsservercore-1709` (*1.8/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/golang/blob/4ae3bfb2fefaeef55f8e5875fdd3ccadbe3bde34/1.8/windows/windowsservercore-1709/Dockerfile)
 
 # Quick reference
 
@@ -151,15 +163,6 @@ This variant is highly recommended when final image size being as small as possi
 
 To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
 
-## `golang:windowsservercore`
-
-This image is based on [Windows Server Core (`microsoft/windowsservercore`)](https://hub.docker.com/r/microsoft/windowsservercore/). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
-
-For information about how to get Docker running on Windows, please see the relevant "Quick Start" guide provided by Microsoft:
-
--	[Windows Server Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server)
--	[Windows 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
-
 ## `golang:onbuild`
 
 The `ONBUILD` image variants are deprecated, and their usage is discouraged. For more details, see [docker-library/official-images#2076](https://github.com/docker-library/official-images/issues/2076).

+ 11 - 9
haproxy/README.md

@@ -16,14 +16,16 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`1.4.27`, `1.4` (*1.4/Dockerfile*)](https://github.com/docker-library/haproxy/blob/a11db1597f9be5365028673df4d05b2ea854b3ed/1.4/Dockerfile)
--	[`1.4.27-alpine`, `1.4-alpine` (*1.4/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/2d393f2b59824bf5c7f692a503c18e2dac43fae7/1.4/alpine/Dockerfile)
--	[`1.5.19`, `1.5` (*1.5/Dockerfile*)](https://github.com/docker-library/haproxy/blob/67667912113013d9dfd14b503c14e120ceab9899/1.5/Dockerfile)
--	[`1.5.19-alpine`, `1.5-alpine` (*1.5/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/2d393f2b59824bf5c7f692a503c18e2dac43fae7/1.5/alpine/Dockerfile)
--	[`1.6.13`, `1.6` (*1.6/Dockerfile*)](https://github.com/docker-library/haproxy/blob/900676649347a83b314fd7b33e0a52265e168577/1.6/Dockerfile)
--	[`1.6.13-alpine`, `1.6-alpine` (*1.6/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/2d393f2b59824bf5c7f692a503c18e2dac43fae7/1.6/alpine/Dockerfile)
--	[`1.7.9`, `1.7`, `1`, `latest` (*1.7/Dockerfile*)](https://github.com/docker-library/haproxy/blob/394255fbe76c57a9f2e0775e3e69df714e801b46/1.7/Dockerfile)
--	[`1.7.9-alpine`, `1.7-alpine`, `1-alpine`, `alpine` (*1.7/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/2d393f2b59824bf5c7f692a503c18e2dac43fae7/1.7/alpine/Dockerfile)
+-	[`1.4.27`, `1.4` (*1.4/Dockerfile*)](https://github.com/docker-library/haproxy/blob/c4e5aad8e303cdf6911e944b667ee2ef69caaa25/1.4/Dockerfile)
+-	[`1.4.27-alpine`, `1.4-alpine` (*1.4/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/c4e5aad8e303cdf6911e944b667ee2ef69caaa25/1.4/alpine/Dockerfile)
+-	[`1.5.19`, `1.5` (*1.5/Dockerfile*)](https://github.com/docker-library/haproxy/blob/c4e5aad8e303cdf6911e944b667ee2ef69caaa25/1.5/Dockerfile)
+-	[`1.5.19-alpine`, `1.5-alpine` (*1.5/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/c4e5aad8e303cdf6911e944b667ee2ef69caaa25/1.5/alpine/Dockerfile)
+-	[`1.6.13`, `1.6` (*1.6/Dockerfile*)](https://github.com/docker-library/haproxy/blob/c4e5aad8e303cdf6911e944b667ee2ef69caaa25/1.6/Dockerfile)
+-	[`1.6.13-alpine`, `1.6-alpine` (*1.6/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/56a8d73e8f835d736544676a30cfe1b445f84836/1.6/alpine/Dockerfile)
+-	[`1.7.9`, `1.7`, `1`, `latest` (*1.7/Dockerfile*)](https://github.com/docker-library/haproxy/blob/c4e5aad8e303cdf6911e944b667ee2ef69caaa25/1.7/Dockerfile)
+-	[`1.7.9-alpine`, `1.7-alpine`, `1-alpine`, `alpine` (*1.7/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/56a8d73e8f835d736544676a30cfe1b445f84836/1.7/alpine/Dockerfile)
+-	[`1.8-rc4`, `1.8-rc`, `rc` (*1.8-rc/Dockerfile*)](https://github.com/docker-library/haproxy/blob/0c9c27713bfca8505331e0da2664a9454755c7b9/1.8-rc/Dockerfile)
+-	[`1.8-rc4-alpine`, `1.8-rc-alpine`, `rc-alpine` (*1.8-rc/alpine/Dockerfile*)](https://github.com/docker-library/haproxy/blob/0c9c27713bfca8505331e0da2664a9454755c7b9/1.8-rc/alpine/Dockerfile)
 
 # Quick reference
 
@@ -37,7 +39,7 @@ WARNING:
 	[the Docker Community](https://github.com/docker-library/haproxy)
 
 -	**Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64))  
-	[`amd64`](https://hub.docker.com/r/amd64/haproxy/), [`arm32v5`](https://hub.docker.com/r/arm32v5/haproxy/), [`arm32v7`](https://hub.docker.com/r/arm32v7/haproxy/), [`arm64v8`](https://hub.docker.com/r/arm64v8/haproxy/), [`i386`](https://hub.docker.com/r/i386/haproxy/), [`ppc64le`](https://hub.docker.com/r/ppc64le/haproxy/), [`s390x`](https://hub.docker.com/r/s390x/haproxy/)
+	[`amd64`](https://hub.docker.com/r/amd64/haproxy/), [`arm32v5`](https://hub.docker.com/r/arm32v5/haproxy/), [`arm32v6`](https://hub.docker.com/r/arm32v6/haproxy/), [`arm32v7`](https://hub.docker.com/r/arm32v7/haproxy/), [`arm64v8`](https://hub.docker.com/r/arm64v8/haproxy/), [`i386`](https://hub.docker.com/r/i386/haproxy/), [`ppc64le`](https://hub.docker.com/r/ppc64le/haproxy/), [`s390x`](https://hub.docker.com/r/s390x/haproxy/)
 
 -	**Published image artifact details**:  
 	[repo-info repo's `repos/haproxy/` directory](https://github.com/docker-library/repo-info/blob/master/repos/haproxy) ([history](https://github.com/docker-library/repo-info/commits/master/repos/haproxy))  

+ 7 - 4
hello-world/README.md

@@ -19,15 +19,18 @@ WARNING:
 ## Simple Tags
 
 -	[`linux` (*amd64/hello-world/Dockerfile*)](https://github.com/docker-library/hello-world/blob/c83a065a24e94e635ddd518c2a3cffc91accf30d/amd64/hello-world/Dockerfile)
--	[`nanoserver` (*amd64/hello-world/nanoserver/Dockerfile*)](https://github.com/docker-library/hello-world/blob/c83a065a24e94e635ddd518c2a3cffc91accf30d/amd64/hello-world/nanoserver/Dockerfile)
--	[`nanoserver1709` (*amd64/hello-world/nanoserver1709/Dockerfile*)](https://github.com/docker-library/hello-world/blob/c83a065a24e94e635ddd518c2a3cffc91accf30d/amd64/hello-world/nanoserver1709/Dockerfile)
+-	[`nanoserver-sac2016` (*amd64/hello-world/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/hello-world/blob/d206a435163e171e629490b2803b2615b3831906/amd64/hello-world/nanoserver-sac2016/Dockerfile)
+-	[`nanoserver-1709` (*amd64/hello-world/nanoserver-1709/Dockerfile*)](https://github.com/docker-library/hello-world/blob/d206a435163e171e629490b2803b2615b3831906/amd64/hello-world/nanoserver-1709/Dockerfile)
 
 ## Shared Tags
 
 -	`latest`:
 	-	[`linux` (*amd64/hello-world/Dockerfile*)](https://github.com/docker-library/hello-world/blob/c83a065a24e94e635ddd518c2a3cffc91accf30d/amd64/hello-world/Dockerfile)
-	-	[`nanoserver` (*amd64/hello-world/nanoserver/Dockerfile*)](https://github.com/docker-library/hello-world/blob/c83a065a24e94e635ddd518c2a3cffc91accf30d/amd64/hello-world/nanoserver/Dockerfile)
-	-	[`nanoserver1709` (*amd64/hello-world/nanoserver1709/Dockerfile*)](https://github.com/docker-library/hello-world/blob/c83a065a24e94e635ddd518c2a3cffc91accf30d/amd64/hello-world/nanoserver1709/Dockerfile)
+	-	[`nanoserver-sac2016` (*amd64/hello-world/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/hello-world/blob/d206a435163e171e629490b2803b2615b3831906/amd64/hello-world/nanoserver-sac2016/Dockerfile)
+	-	[`nanoserver-1709` (*amd64/hello-world/nanoserver-1709/Dockerfile*)](https://github.com/docker-library/hello-world/blob/d206a435163e171e629490b2803b2615b3831906/amd64/hello-world/nanoserver-1709/Dockerfile)
+-	`nanoserver`:
+	-	[`nanoserver-sac2016` (*amd64/hello-world/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/hello-world/blob/d206a435163e171e629490b2803b2615b3831906/amd64/hello-world/nanoserver-sac2016/Dockerfile)
+	-	[`nanoserver-1709` (*amd64/hello-world/nanoserver-1709/Dockerfile*)](https://github.com/docker-library/hello-world/blob/d206a435163e171e629490b2803b2615b3831906/amd64/hello-world/nanoserver-1709/Dockerfile)
 
 # Quick reference
 

+ 25 - 25
mongo/README.md

@@ -19,28 +19,45 @@ WARNING:
 ## Simple Tags
 
 -	[`3.0.15-wheezy`, `3.0-wheezy` (*3.0/Dockerfile*)](https://github.com/docker-library/mongo/blob/00a8519463e776e797c227681a595986d8f9dbe1/3.0/Dockerfile)
--	[`3.0.15-windowsservercore`, `3.0-windowsservercore` (*3.0/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/40d62a73bbd4e20d90ec859a8af483f70b1e5fd4/3.0/windows/windowsservercore/Dockerfile)
+-	[`3.0.15-windowsservercore-ltsc2016`, `3.0-windowsservercore-ltsc2016` (*3.0/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.0/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.0.15-windowsservercore-1709`, `3.0-windowsservercore-1709` (*3.0/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.0/windows/windowsservercore-1709/Dockerfile)
 -	[`3.2.17-jessie`, `3.2-jessie` (*3.2/Dockerfile*)](https://github.com/docker-library/mongo/blob/3eb1f6df20e04ea8f03ce8ba5893e21bb63073f5/3.2/Dockerfile)
--	[`3.2.17-windowsservercore`, `3.2-windowsservercore` (*3.2/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/7b2fe2cd853161fdb6d28d318e9e7968e51d0ee3/3.2/windows/windowsservercore/Dockerfile)
+-	[`3.2.17-windowsservercore-ltsc2016`, `3.2-windowsservercore-ltsc2016` (*3.2/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.2/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.2.17-windowsservercore-1709`, `3.2-windowsservercore-1709` (*3.2/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.2/windows/windowsservercore-1709/Dockerfile)
 -	[`3.4.10-jessie`, `3.4-jessie`, `3-jessie`, `jessie` (*3.4/Dockerfile*)](https://github.com/docker-library/mongo/blob/c501968a9c330a773a2bc2c9b67dcd4ebbb58651/3.4/Dockerfile)
--	[`3.4.10-windowsservercore`, `3.4-windowsservercore`, `3-windowsservercore`, `windowsservercore` (*3.4/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/c501968a9c330a773a2bc2c9b67dcd4ebbb58651/3.4/windows/windowsservercore/Dockerfile)
+-	[`3.4.10-windowsservercore-ltsc2016`, `3.4-windowsservercore-ltsc2016`, `3-windowsservercore-ltsc2016`, `windowsservercore-ltsc2016` (*3.4/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.4/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.4.10-windowsservercore-1709`, `3.4-windowsservercore-1709`, `3-windowsservercore-1709`, `windowsservercore-1709` (*3.4/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.4/windows/windowsservercore-1709/Dockerfile)
 -	[`3.5.13-jessie`, `3.5-jessie`, `unstable-jessie` (*3.5/Dockerfile*)](https://github.com/docker-library/mongo/blob/532f0dce1488540fb486d58407aff00301203e47/3.5/Dockerfile)
--	[`3.5.13-windowsservercore`, `3.5-windowsservercore`, `unstable-windowsservercore` (*3.5/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/532f0dce1488540fb486d58407aff00301203e47/3.5/windows/windowsservercore/Dockerfile)
+-	[`3.5.13-windowsservercore-ltsc2016`, `3.5-windowsservercore-ltsc2016`, `unstable-windowsservercore-ltsc2016` (*3.5/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.5/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.5.13-windowsservercore-1709`, `3.5-windowsservercore-1709`, `unstable-windowsservercore-1709` (*3.5/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.5/windows/windowsservercore-1709/Dockerfile)
 
 ## Shared Tags
 
 -	`3.0.15`, `3.0`:
 	-	[`3.0.15-wheezy` (*3.0/Dockerfile*)](https://github.com/docker-library/mongo/blob/00a8519463e776e797c227681a595986d8f9dbe1/3.0/Dockerfile)
-	-	[`3.0.15-windowsservercore` (*3.0/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/40d62a73bbd4e20d90ec859a8af483f70b1e5fd4/3.0/windows/windowsservercore/Dockerfile)
+	-	[`3.0.15-windowsservercore-ltsc2016` (*3.0/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.0/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.0.15-windowsservercore-1709` (*3.0/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.0/windows/windowsservercore-1709/Dockerfile)
+-	`windowsservercore`:
+	-	[`3.0.15-windowsservercore-ltsc2016` (*3.0/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.0/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.0.15-windowsservercore-1709` (*3.0/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.0/windows/windowsservercore-1709/Dockerfile)
+	-	[`3.2.17-windowsservercore-ltsc2016` (*3.2/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.2/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.2.17-windowsservercore-1709` (*3.2/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.2/windows/windowsservercore-1709/Dockerfile)
+	-	[`3.4.10-windowsservercore-ltsc2016` (*3.4/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.4/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.4.10-windowsservercore-1709` (*3.4/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.4/windows/windowsservercore-1709/Dockerfile)
+	-	[`3.5.13-windowsservercore-ltsc2016` (*3.5/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.5/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.5.13-windowsservercore-1709` (*3.5/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.5/windows/windowsservercore-1709/Dockerfile)
 -	`3.2.17`, `3.2`:
 	-	[`3.2.17-jessie` (*3.2/Dockerfile*)](https://github.com/docker-library/mongo/blob/3eb1f6df20e04ea8f03ce8ba5893e21bb63073f5/3.2/Dockerfile)
-	-	[`3.2.17-windowsservercore` (*3.2/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/7b2fe2cd853161fdb6d28d318e9e7968e51d0ee3/3.2/windows/windowsservercore/Dockerfile)
+	-	[`3.2.17-windowsservercore-ltsc2016` (*3.2/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.2/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.2.17-windowsservercore-1709` (*3.2/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.2/windows/windowsservercore-1709/Dockerfile)
 -	`3.4.10`, `3.4`, `3`, `latest`:
 	-	[`3.4.10-jessie` (*3.4/Dockerfile*)](https://github.com/docker-library/mongo/blob/c501968a9c330a773a2bc2c9b67dcd4ebbb58651/3.4/Dockerfile)
-	-	[`3.4.10-windowsservercore` (*3.4/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/c501968a9c330a773a2bc2c9b67dcd4ebbb58651/3.4/windows/windowsservercore/Dockerfile)
+	-	[`3.4.10-windowsservercore-ltsc2016` (*3.4/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.4/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.4.10-windowsservercore-1709` (*3.4/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.4/windows/windowsservercore-1709/Dockerfile)
 -	`3.5.13`, `3.5`, `unstable`:
 	-	[`3.5.13-jessie` (*3.5/Dockerfile*)](https://github.com/docker-library/mongo/blob/532f0dce1488540fb486d58407aff00301203e47/3.5/Dockerfile)
-	-	[`3.5.13-windowsservercore` (*3.5/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/mongo/blob/532f0dce1488540fb486d58407aff00301203e47/3.5/windows/windowsservercore/Dockerfile)
+	-	[`3.5.13-windowsservercore-ltsc2016` (*3.5/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.5/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.5.13-windowsservercore-1709` (*3.5/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/mongo/blob/daeeeccd0edd110e6341ba3ee2d699caf885fbce/3.5/windows/windowsservercore-1709/Dockerfile)
 
 # Quick reference
 
@@ -175,23 +192,6 @@ Note that users on host systems with SELinux enabled may see issues with this. T
 $ chcon -Rt svirt_sandbox_file_t /my/own/datadir
 ```
 
-# Image Variants
-
-The `mongo` images come in many flavors, each designed for a specific use case.
-
-## `mongo:<version>`
-
-This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
-
-## `mongo:windowsservercore`
-
-This image is based on [Windows Server Core (`microsoft/windowsservercore`)](https://hub.docker.com/r/microsoft/windowsservercore/). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
-
-For information about how to get Docker running on Windows, please see the relevant "Quick Start" guide provided by Microsoft:
-
--	[Windows Server Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server)
--	[Windows 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
-
 # License
 
 View [license information](https://github.com/mongodb/mongo/blob/7c3cfac300cfcca4f73f1c3b18457f0f8fae3f69/README#L71) for the software contained in this image.

+ 19 - 13
openjdk/README.md

@@ -16,6 +16,8 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
+## Simple Tags
+
 -	[`6b38-jdk`, `6b38`, `6-jdk`, `6` (*6-jdk/Dockerfile*)](https://github.com/docker-library/openjdk/blob/b4f29ba829765552239bd18f272fcdaf09eca259/6-jdk/Dockerfile)
 -	[`6b38-jdk-slim`, `6b38-slim`, `6-jdk-slim`, `6-slim` (*6-jdk/slim/Dockerfile*)](https://github.com/docker-library/openjdk/blob/b4f29ba829765552239bd18f272fcdaf09eca259/6-jdk/slim/Dockerfile)
 -	[`6b38-jre`, `6-jre` (*6-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/80490366d49e6781e9dcb5dad8ebf0fb6ec04000/6-jre/Dockerfile)
@@ -29,18 +31,31 @@ WARNING:
 -	[`8u151-jdk`, `8u151`, `8-jdk`, `8`, `jdk`, `latest` (*8-jdk/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/8-jdk/Dockerfile)
 -	[`8u151-jdk-slim`, `8u151-slim`, `8-jdk-slim`, `8-slim`, `jdk-slim`, `slim` (*8-jdk/slim/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/8-jdk/slim/Dockerfile)
 -	[`8u131-jdk-alpine`, `8u131-alpine`, `8-jdk-alpine`, `8-alpine`, `jdk-alpine`, `alpine` (*8-jdk/alpine/Dockerfile*)](https://github.com/docker-library/openjdk/blob/b4f29ba829765552239bd18f272fcdaf09eca259/8-jdk/alpine/Dockerfile)
--	[`8u151-jdk-windowsservercore`, `8u151-windowsservercore`, `8-jdk-windowsservercore`, `8-windowsservercore`, `jdk-windowsservercore`, `windowsservercore` (*8-jdk/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/8-jdk/windows/windowsservercore/Dockerfile)
--	[`8u151-jdk-nanoserver`, `8u151-nanoserver`, `8-jdk-nanoserver`, `8-nanoserver`, `jdk-nanoserver`, `nanoserver` (*8-jdk/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/8-jdk/windows/nanoserver/Dockerfile)
+-	[`8u151-jdk-windowsservercore-ltsc2016`, `8u151-windowsservercore-ltsc2016`, `8-jdk-windowsservercore-ltsc2016`, `8-windowsservercore-ltsc2016`, `jdk-windowsservercore-ltsc2016`, `windowsservercore-ltsc2016` (*8-jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/8-jdk/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`8u151-jdk-windowsservercore-1709`, `8u151-windowsservercore-1709`, `8-jdk-windowsservercore-1709`, `8-windowsservercore-1709`, `jdk-windowsservercore-1709`, `windowsservercore-1709` (*8-jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/8-jdk/windows/windowsservercore-1709/Dockerfile)
+-	[`8u151-jdk-nanoserver-sac2016`, `8u151-nanoserver-sac2016`, `8-jdk-nanoserver-sac2016`, `8-nanoserver-sac2016`, `jdk-nanoserver-sac2016`, `nanoserver-sac2016` (*8-jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/8-jdk/windows/nanoserver-sac2016/Dockerfile)
 -	[`8u151-jre`, `8-jre`, `jre` (*8-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/8-jre/Dockerfile)
 -	[`8u151-jre-slim`, `8-jre-slim`, `jre-slim` (*8-jre/slim/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/8-jre/slim/Dockerfile)
 -	[`8u131-jre-alpine`, `8-jre-alpine`, `jre-alpine` (*8-jre/alpine/Dockerfile*)](https://github.com/docker-library/openjdk/blob/b4f29ba829765552239bd18f272fcdaf09eca259/8-jre/alpine/Dockerfile)
 -	[`9.0.1-11-jdk`, `9.0.1-11`, `9.0.1-jdk`, `9.0.1`, `9.0-jdk`, `9.0`, `9-jdk`, `9` (*9-jdk/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/9-jdk/Dockerfile)
 -	[`9.0.1-11-jdk-slim`, `9.0.1-11-slim`, `9.0.1-jdk-slim`, `9.0.1-slim`, `9.0-jdk-slim`, `9.0-slim`, `9-jdk-slim`, `9-slim` (*9-jdk/slim/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/9-jdk/slim/Dockerfile)
--	[`9.0.1-jdk-windowsservercore`, `9.0.1-windowsservercore`, `9.0-jdk-windowsservercore`, `9.0-windowsservercore`, `9-jdk-windowsservercore`, `9-windowsservercore` (*9-jdk/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/9-jdk/windows/windowsservercore/Dockerfile)
--	[`9.0.1-jdk-nanoserver`, `9.0.1-nanoserver`, `9.0-jdk-nanoserver`, `9.0-nanoserver`, `9-jdk-nanoserver`, `9-nanoserver` (*9-jdk/windows/nanoserver/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/9-jdk/windows/nanoserver/Dockerfile)
+-	[`9.0.1-jdk-windowsservercore-ltsc2016`, `9.0.1-windowsservercore-ltsc2016`, `9.0-jdk-windowsservercore-ltsc2016`, `9.0-windowsservercore-ltsc2016`, `9-jdk-windowsservercore-ltsc2016`, `9-windowsservercore-ltsc2016` (*9-jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/9-jdk/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`9.0.1-jdk-windowsservercore-1709`, `9.0.1-windowsservercore-1709`, `9.0-jdk-windowsservercore-1709`, `9.0-windowsservercore-1709`, `9-jdk-windowsservercore-1709`, `9-windowsservercore-1709` (*9-jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/9-jdk/windows/windowsservercore-1709/Dockerfile)
+-	[`9.0.1-jdk-nanoserver-sac2016`, `9.0.1-nanoserver-sac2016`, `9.0-jdk-nanoserver-sac2016`, `9.0-nanoserver-sac2016`, `9-jdk-nanoserver-sac2016`, `9-nanoserver-sac2016` (*9-jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/9-jdk/windows/nanoserver-sac2016/Dockerfile)
 -	[`9.0.1-11-jre`, `9.0.1-jre`, `9.0-jre`, `9-jre` (*9-jre/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/9-jre/Dockerfile)
 -	[`9.0.1-11-jre-slim`, `9.0.1-jre-slim`, `9.0-jre-slim`, `9-jre-slim` (*9-jre/slim/Dockerfile*)](https://github.com/docker-library/openjdk/blob/a893fe3cd82757e7bccc0948c88bfee09bd916c3/9-jre/slim/Dockerfile)
 
+## Shared Tags
+
+-	`windowsservercore`:
+	-	[`8u151-jdk-windowsservercore-ltsc2016` (*8-jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/8-jdk/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`8u151-jdk-windowsservercore-1709` (*8-jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/8-jdk/windows/windowsservercore-1709/Dockerfile)
+	-	[`9.0.1-jdk-windowsservercore-ltsc2016` (*9-jdk/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/9-jdk/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`9.0.1-jdk-windowsservercore-1709` (*9-jdk/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/9-jdk/windows/windowsservercore-1709/Dockerfile)
+-	`nanoserver`:
+	-	[`8u151-jdk-nanoserver-sac2016` (*8-jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/8-jdk/windows/nanoserver-sac2016/Dockerfile)
+	-	[`9.0.1-jdk-nanoserver-sac2016` (*9-jdk/windows/nanoserver-sac2016/Dockerfile*)](https://github.com/docker-library/openjdk/blob/873fb56728befef8ecaf8436c3a27fd239cba301/9-jdk/windows/nanoserver-sac2016/Dockerfile)
+
 # Quick reference
 
 -	**Where to get help**:  
@@ -150,15 +165,6 @@ This variant is highly recommended when final image size being as small as possi
 
 To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
 
-## `openjdk:windowsservercore`
-
-This image is based on [Windows Server Core (`microsoft/windowsservercore`)](https://hub.docker.com/r/microsoft/windowsservercore/). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
-
-For information about how to get Docker running on Windows, please see the relevant "Quick Start" guide provided by Microsoft:
-
--	[Windows Server Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server)
--	[Windows 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
-
 # License
 
 View [license information](http://openjdk.java.net/legal/gplv2+ce.html) for the software contained in this image.

+ 25 - 17
python/README.md

@@ -21,7 +21,8 @@ WARNING:
 -	[`3.7.0a2-stretch`, `3.7-rc-stretch`, `rc-stretch` (*3.7-rc/stretch/Dockerfile*)](https://github.com/docker-library/python/blob/3f12f511910098f45951111aa5642fd935133afc/3.7-rc/stretch/Dockerfile)
 -	[`3.7.0a2-slim-stretch`, `3.7-rc-slim-stretch`, `rc-slim-stretch`, `3.7.0a2-slim`, `3.7-rc-slim`, `rc-slim` (*3.7-rc/stretch/slim/Dockerfile*)](https://github.com/docker-library/python/blob/a4ce69de053337ec22d7f322cd997398eeba2350/3.7-rc/stretch/slim/Dockerfile)
 -	[`3.7.0a2-alpine3.6`, `3.7-rc-alpine3.6`, `rc-alpine3.6`, `3.7.0a2-alpine`, `3.7-rc-alpine`, `rc-alpine` (*3.7-rc/alpine3.6/Dockerfile*)](https://github.com/docker-library/python/blob/3f12f511910098f45951111aa5642fd935133afc/3.7-rc/alpine3.6/Dockerfile)
--	[`3.7.0a2-windowsservercore`, `3.7-rc-windowsservercore`, `rc-windowsservercore` (*3.7-rc/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/3f12f511910098f45951111aa5642fd935133afc/3.7-rc/windows/windowsservercore/Dockerfile)
+-	[`3.7.0a2-windowsservercore-ltsc2016`, `3.7-rc-windowsservercore-ltsc2016`, `rc-windowsservercore-ltsc2016` (*3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.7.0a2-windowsservercore-1709`, `3.7-rc-windowsservercore-1709`, `rc-windowsservercore-1709` (*3.7-rc/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.7-rc/windows/windowsservercore-1709/Dockerfile)
 -	[`3.6.3-stretch`, `3.6-stretch`, `3-stretch`, `stretch` (*3.6/stretch/Dockerfile*)](https://github.com/docker-library/python/blob/cf179e4a7b442b29d85f521c2b172b89ef04beef/3.6/stretch/Dockerfile)
 -	[`3.6.3-slim-stretch`, `3.6-slim-stretch`, `3-slim-stretch`, `slim-stretch` (*3.6/stretch/slim/Dockerfile*)](https://github.com/docker-library/python/blob/a4ce69de053337ec22d7f322cd997398eeba2350/3.6/stretch/slim/Dockerfile)
 -	[`3.6.3-jessie`, `3.6-jessie`, `3-jessie`, `jessie` (*3.6/jessie/Dockerfile*)](https://github.com/docker-library/python/blob/cf179e4a7b442b29d85f521c2b172b89ef04beef/3.6/jessie/Dockerfile)
@@ -29,12 +30,14 @@ WARNING:
 -	[`3.6.3-onbuild`, `3.6-onbuild`, `3-onbuild`, `onbuild` (*3.6/jessie/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/f12c2df135aef8c3f645d90aae582b2c65dbc3b5/3.6/jessie/onbuild/Dockerfile)
 -	[`3.6.3-alpine3.6`, `3.6-alpine3.6`, `3-alpine3.6`, `alpine3.6` (*3.6/alpine3.6/Dockerfile*)](https://github.com/docker-library/python/blob/1d59eb2dd813c64891bf554a8ea01754aba25816/3.6/alpine3.6/Dockerfile)
 -	[`3.6.3-alpine3.4`, `3.6-alpine3.4`, `3-alpine3.4`, `alpine3.4`, `3.6.3-alpine`, `3.6-alpine`, `3-alpine`, `alpine` (*3.6/alpine3.4/Dockerfile*)](https://github.com/docker-library/python/blob/1d59eb2dd813c64891bf554a8ea01754aba25816/3.6/alpine3.4/Dockerfile)
--	[`3.6.3-windowsservercore`, `3.6-windowsservercore`, `3-windowsservercore`, `windowsservercore` (*3.6/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/e01eb54f3c70555cf661dd756d529c85fd2cc04f/3.6/windows/windowsservercore/Dockerfile)
+-	[`3.6.3-windowsservercore-ltsc2016`, `3.6-windowsservercore-ltsc2016`, `3-windowsservercore-ltsc2016`, `windowsservercore-ltsc2016` (*3.6/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.6/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.6.3-windowsservercore-1709`, `3.6-windowsservercore-1709`, `3-windowsservercore-1709`, `windowsservercore-1709` (*3.6/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.6/windows/windowsservercore-1709/Dockerfile)
 -	[`3.5.4-jessie`, `3.5-jessie` (*3.5/jessie/Dockerfile*)](https://github.com/docker-library/python/blob/6ebbaa8a56cdf4021c78e87b3872be3861ac072a/3.5/jessie/Dockerfile)
 -	[`3.5.4-slim-jessie`, `3.5-slim-jessie`, `3.5.4-slim`, `3.5-slim` (*3.5/jessie/slim/Dockerfile*)](https://github.com/docker-library/python/blob/a4ce69de053337ec22d7f322cd997398eeba2350/3.5/jessie/slim/Dockerfile)
 -	[`3.5.4-onbuild`, `3.5-onbuild` (*3.5/jessie/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/f12c2df135aef8c3f645d90aae582b2c65dbc3b5/3.5/jessie/onbuild/Dockerfile)
 -	[`3.5.4-alpine3.4`, `3.5-alpine3.4`, `3.5.4-alpine`, `3.5-alpine` (*3.5/alpine3.4/Dockerfile*)](https://github.com/docker-library/python/blob/1d59eb2dd813c64891bf554a8ea01754aba25816/3.5/alpine3.4/Dockerfile)
--	[`3.5.4-windowsservercore`, `3.5-windowsservercore` (*3.5/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/9524a26b67ebc8ea48ceaaf6750f5f6caf89478e/3.5/windows/windowsservercore/Dockerfile)
+-	[`3.5.4-windowsservercore-ltsc2016`, `3.5-windowsservercore-ltsc2016` (*3.5/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.5/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`3.5.4-windowsservercore-1709`, `3.5-windowsservercore-1709` (*3.5/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.5/windows/windowsservercore-1709/Dockerfile)
 -	[`3.4.7-jessie`, `3.4-jessie` (*3.4/jessie/Dockerfile*)](https://github.com/docker-library/python/blob/27516b7347b3236a3accd4b2e1242a53fb54d04c/3.4/jessie/Dockerfile)
 -	[`3.4.7-slim-jessie`, `3.4-slim-jessie`, `3.4.7-slim`, `3.4-slim` (*3.4/jessie/slim/Dockerfile*)](https://github.com/docker-library/python/blob/a4ce69de053337ec22d7f322cd997398eeba2350/3.4/jessie/slim/Dockerfile)
 -	[`3.4.7-onbuild`, `3.4-onbuild` (*3.4/jessie/onbuild/Dockerfile*)](https://github.com/docker-library/python/blob/f12c2df135aef8c3f645d90aae582b2c65dbc3b5/3.4/jessie/onbuild/Dockerfile)
@@ -48,24 +51,38 @@ WARNING:
 -	[`2.7.14-wheezy`, `2.7-wheezy`, `2-wheezy` (*2.7/wheezy/Dockerfile*)](https://github.com/docker-library/python/blob/b1512ead24c6b111506a8d4229134a29da240597/2.7/wheezy/Dockerfile)
 -	[`2.7.14-alpine3.6`, `2.7-alpine3.6`, `2-alpine3.6` (*2.7/alpine3.6/Dockerfile*)](https://github.com/docker-library/python/blob/1d59eb2dd813c64891bf554a8ea01754aba25816/2.7/alpine3.6/Dockerfile)
 -	[`2.7.14-alpine3.4`, `2.7-alpine3.4`, `2-alpine3.4`, `2.7.14-alpine`, `2.7-alpine`, `2-alpine` (*2.7/alpine3.4/Dockerfile*)](https://github.com/docker-library/python/blob/1d59eb2dd813c64891bf554a8ea01754aba25816/2.7/alpine3.4/Dockerfile)
--	[`2.7.14-windowsservercore`, `2.7-windowsservercore`, `2-windowsservercore` (*2.7/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/9524a26b67ebc8ea48ceaaf6750f5f6caf89478e/2.7/windows/windowsservercore/Dockerfile)
+-	[`2.7.14-windowsservercore-ltsc2016`, `2.7-windowsservercore-ltsc2016`, `2-windowsservercore-ltsc2016` (*2.7/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/2.7/windows/windowsservercore-ltsc2016/Dockerfile)
+-	[`2.7.14-windowsservercore-1709`, `2.7-windowsservercore-1709`, `2-windowsservercore-1709` (*2.7/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/2.7/windows/windowsservercore-1709/Dockerfile)
 
 ## Shared Tags
 
 -	`3.7.0a2`, `3.7-rc`, `rc`:
 	-	[`3.7.0a2-stretch` (*3.7-rc/stretch/Dockerfile*)](https://github.com/docker-library/python/blob/3f12f511910098f45951111aa5642fd935133afc/3.7-rc/stretch/Dockerfile)
-	-	[`3.7.0a2-windowsservercore` (*3.7-rc/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/3f12f511910098f45951111aa5642fd935133afc/3.7-rc/windows/windowsservercore/Dockerfile)
+	-	[`3.7.0a2-windowsservercore-ltsc2016` (*3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.7.0a2-windowsservercore-1709` (*3.7-rc/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.7-rc/windows/windowsservercore-1709/Dockerfile)
+-	`windowsservercore`:
+	-	[`3.7.0a2-windowsservercore-ltsc2016` (*3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.7.0a2-windowsservercore-1709` (*3.7-rc/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.7-rc/windows/windowsservercore-1709/Dockerfile)
+	-	[`3.6.3-windowsservercore-ltsc2016` (*3.6/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.6/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.6.3-windowsservercore-1709` (*3.6/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.6/windows/windowsservercore-1709/Dockerfile)
+	-	[`3.5.4-windowsservercore-ltsc2016` (*3.5/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.5/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.5.4-windowsservercore-1709` (*3.5/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.5/windows/windowsservercore-1709/Dockerfile)
+	-	[`2.7.14-windowsservercore-ltsc2016` (*2.7/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/2.7/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`2.7.14-windowsservercore-1709` (*2.7/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/2.7/windows/windowsservercore-1709/Dockerfile)
 -	`3.6.3`, `3.6`, `3`, `latest`:
 	-	[`3.6.3-jessie` (*3.6/jessie/Dockerfile*)](https://github.com/docker-library/python/blob/cf179e4a7b442b29d85f521c2b172b89ef04beef/3.6/jessie/Dockerfile)
-	-	[`3.6.3-windowsservercore` (*3.6/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/e01eb54f3c70555cf661dd756d529c85fd2cc04f/3.6/windows/windowsservercore/Dockerfile)
+	-	[`3.6.3-windowsservercore-ltsc2016` (*3.6/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.6/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.6.3-windowsservercore-1709` (*3.6/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.6/windows/windowsservercore-1709/Dockerfile)
 -	`3.5.4`, `3.5`:
 	-	[`3.5.4-jessie` (*3.5/jessie/Dockerfile*)](https://github.com/docker-library/python/blob/6ebbaa8a56cdf4021c78e87b3872be3861ac072a/3.5/jessie/Dockerfile)
-	-	[`3.5.4-windowsservercore` (*3.5/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/9524a26b67ebc8ea48ceaaf6750f5f6caf89478e/3.5/windows/windowsservercore/Dockerfile)
+	-	[`3.5.4-windowsservercore-ltsc2016` (*3.5/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.5/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`3.5.4-windowsservercore-1709` (*3.5/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/3.5/windows/windowsservercore-1709/Dockerfile)
 -	`3.4.7`, `3.4`:
 	-	[`3.4.7-jessie` (*3.4/jessie/Dockerfile*)](https://github.com/docker-library/python/blob/27516b7347b3236a3accd4b2e1242a53fb54d04c/3.4/jessie/Dockerfile)
 -	`2.7.14`, `2.7`, `2`:
 	-	[`2.7.14-jessie` (*2.7/jessie/Dockerfile*)](https://github.com/docker-library/python/blob/b1512ead24c6b111506a8d4229134a29da240597/2.7/jessie/Dockerfile)
-	-	[`2.7.14-windowsservercore` (*2.7/windows/windowsservercore/Dockerfile*)](https://github.com/docker-library/python/blob/9524a26b67ebc8ea48ceaaf6750f5f6caf89478e/2.7/windows/windowsservercore/Dockerfile)
+	-	[`2.7.14-windowsservercore-ltsc2016` (*2.7/windows/windowsservercore-ltsc2016/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/2.7/windows/windowsservercore-ltsc2016/Dockerfile)
+	-	[`2.7.14-windowsservercore-1709` (*2.7/windows/windowsservercore-1709/Dockerfile*)](https://github.com/docker-library/python/blob/ce648832b041293fa3542af884ac5a44a67354d3/2.7/windows/windowsservercore-1709/Dockerfile)
 
 # Quick reference
 
@@ -176,15 +193,6 @@ This variant is highly recommended when final image size being as small as possi
 
 To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
 
-## `python:windowsservercore`
-
-This image is based on [Windows Server Core (`microsoft/windowsservercore`)](https://hub.docker.com/r/microsoft/windowsservercore/). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
-
-For information about how to get Docker running on Windows, please see the relevant "Quick Start" guide provided by Microsoft:
-
--	[Windows Server Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server)
--	[Windows 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
-
 ## `python:onbuild`
 
 The `ONBUILD` image variants are deprecated, and their usage is discouraged. For more details, see [docker-library/official-images#2076](https://github.com/docker-library/official-images/issues/2076).