Remove 1709, cleanup base images

Author: StefanScherer

CVE-2017-0290/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.2007
+FROM mcr.microsoft.com/windows/servercore:10.0.14393.2007
 
 RUN powershell -command wget -useb -outfile testcase.js https://bugs.chromium.org/p/project-zero/issues/attachment?aid=283405
 

PowerShellTricks.md

@@ -125,7 +125,7 @@ ls | measure
 To measure the time that a command takes, use
 
 ```powershell
-Measure-Command {docker run microsoft/nanoserver hostname}
+Measure-Command {docker run mcr.microsoft.com/windows/nanoserver:1809 hostname}
 ```
 
 ## time the stdout of another command

README.md

@@ -1,7 +1,7 @@
 # dockerfiles-windows
 [![Build status](https://ci.appveyor.com/api/projects/status/adxm3egqc5md3fe3/branch/master?svg=true)](https://ci.appveyor.com/project/StefanScherer/dockerfiles-windows/branch/master)
 
-Various Dockerfiles for Windows. Most of these can be run as Windows Containers on Windows 10, Windows Server 2016, Windows Server 1709 and Windows Server 1803.
+Various Dockerfiles for Windows. Most of these can be run as Windows Containers on Windows 10, Windows Server 2016, Windows Server 1803 and Windows Server 2019.
 
 Most of these Dockerfiles are automatically built on [AppVeyor](https://www.appveyor.com) and pushed to Docker Hub. See the badges in each sub folder's README files.
 
@@ -26,23 +26,22 @@ Most of these Dockerfiles are automatically built on [AppVeyor](https://www.appv
     * Deploy a Windows Server 2016 VM to Azure with [`docker-windows-azure`](https://github.com/StefanScherer/docker-windows-azure) template
 * Clone this repo and create some Docker images
 
-### Windows Server 1709
-* Get a Windows Server 1709 Virtual Machine
-  * **Packer and Vagrant**
-    * Use Packer with this [packer-windows](https://github.com/StefanScherer/packer-windows) templates to build the `windows_server_1709_docker` Vagrant box]. You need the ISO file from your MSDN subscription.
-    * Use Vagrant and this [windows-docker-machine](https://github.com/StefanScherer/windows-docker-machine) Vagrantfile to have Docker and lots of Docker Tools installed. Run `vagrant up 1709`.
-  * **Azure**
-    * Deploy a Windows Server 1709 VM to Azure with [`docker-windows-azure`](https://github.com/StefanScherer/docker-windows-azure) template
-* Clone this repo and create some Docker images. Look for the `Dockerfile.1709` files.
-* It is recommended to use the smaller base images `microsoft/nanoserver:1709` and `microsoft/windowsservercore:1709`.
-
 ### Windows Server 1803
 * Get a Windows Server 1803 Virtual Machine
   * **Packer and Vagrant**
     * Use Packer with this [packer-windows](https://github.com/StefanScherer/packer-windows) templates to build the `windows_server_1803_docker` Vagrant box]. You need the ISO file from your MSDN subscription.
     * Use Vagrant and this [windows-docker-machine](https://github.com/StefanScherer/windows-docker-machine) Vagrantfile to have Docker and lots of Docker Tools installed. Run `vagrant up 1803`.
     * Clone this repo and create some Docker images. Look for the `Dockerfile.1803` files.
-    * It is recommended to use the smaller base images `microsoft/nanoserver:1803` and `microsoft/windowsservercore:1803`.
+    * It is recommended to use the smaller base images `mcr.microsoft.com/windows/nanoserver:1803` and `mcr.microsoft.com/windows/servercore:1803`.
+
+
+### Windows Server 2019
+* Get a Windows Server 2019 Virtual Machine
+  * **Packer and Vagrant**
+    * Use Packer with this [packer-windows](https://github.com/StefanScherer/packer-windows) templates to build the `windows_2019_docker` Vagrant box]. You need the ISO file from your MSDN subscription.
+    * Use Vagrant and this [windows-docker-machine](https://github.com/StefanScherer/windows-docker-machine) Vagrantfile to have Docker and lots of Docker Tools installed. Run `vagrant up 2019`.
+    * Clone this repo and create some Docker images. Look for the `Dockerfile.1809` files.
+    * It is recommended to use the smaller base images `mcr.microsoft.com/windows/nanoserver:1809` and `mcr.microsoft.com/windows/servercore:1809`.
 
 ## Further reading
   * [Network start-up and performance improvements in Windows 10 April 2018 Update and Windows Server, version 1803](https://blogs.technet.microsoft.com/networking/2018/04/27/network-start-up-and-performance-improvements-in-windows-10-spring-creators-update-and-windows-server-version-1803/), 2018-04-27

apache/Dockerfile

@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/windowsservercore as download
+FROM mcr.microsoft.com/windows/servercore:ltsc2016 as download
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -13,7 +13,7 @@ RUN Invoke-WebRequest 'https://download.microsoft.com/download/9/3/F/93FCF1E7-E6
     Start-Process '.\vc_redist.x64.exe' '/install /passive /norestart' -Wait; `
     Remove-Item vc_redist.x64.exe;
 
-FROM microsoft/nanoserver:10.0.14393.2125
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 COPY --from=download C:\Apache24 C:\Apache24
 COPY --from=download C:\windows\system32\msvcp140.dll C:\windows\system32

apache/push.ps1

@@ -1,20 +1,5 @@
 $version=$(select-string -Path Dockerfile -Pattern "ENV APACHE_VERSION").ToString().split()[-1]
-docker tag apache:$version stefanscherer/apache-windows:$version-1607
-docker push stefanscherer/apache-windows:$version-1607
-
-npm install -g rebase-docker-image
-rebase-docker-image stefanscherer/apache-windows:$version-1607 -t stefanscherer/apache-windows:$version-1709 -b microsoft/nanoserver:1709
-
-..\update-docker-cli.ps1
-
-docker manifest create `
-  stefanscherer/apache-windows:$version `
-  stefanscherer/apache-windows:$version-1607 `
-  stefanscherer/apache-windows:$version-1709
-docker manifest push stefanscherer/apache-windows:$version
-
-docker manifest create `
-  stefanscherer/apache-windows:latest `
-  stefanscherer/apache-windows:$version-1607 `
-  stefanscherer/apache-windows:$version-1709
-docker manifest push stefanscherer/apache-windows:latest
+docker tag apache:$version stefanscherer/apache-windows:$version
+docker push stefanscherer/apache-windows:$version
+docker tag apache:$version stefanscherer/apache-windows:latest
+docker push stefanscherer/apache-windows:latest

build.ps1

@@ -2,10 +2,6 @@ $ErrorActionPreference = 'Stop';
 $files = ""
 Write-Host Starting build
 
-# Write-Host Updating base images
-# docker pull microsoft/windowsservercore
-# docker pull microsoft/nanoserver
-
 if ( $env:APPVEYOR_PULL_REQUEST_NUMBER ) {
   Write-Host Pull request $env:APPVEYOR_PULL_REQUEST_NUMBER
   $files = $(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master))

busybox/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:10.0.14393.2068 AS prep
+FROM mcr.microsoft.com/windows/nanoserver:10.0.14393.2068 AS prep
 WORKDIR /busybox
 ADD https://github.com/jhowardmsft/busybox64/raw/master/busybox.exe busybox.exe
 RUN FOR /f "tokens=*" %i IN ('busybox --list') DO mklink C:\busybox\%i.exe busybox.exe

busybox/Dockerfile.1709

@@ -2,7 +2,7 @@
 [![This image on DockerHub](https://img.shields.io/docker/pulls/stefanscherer/busybox-windows.svg)](https://hub.docker.com/r/stefanscherer/busybox-windows/)
 
 Based on the 64bit version of busybox.exe, thanks to John Howard's work in https://github.com/jhowardmsft/busybox64
-we now can have tar, wget and other tools in a NanoServer image. Even in a nanoserver:1709.
+we now can have tar, wget and other tools in a NanoServer image.
 I've added curl.exe 
 
 Limits:

busybox/README.md

@@ -1,5 +1,2 @@
 docker tag busybox stefanscherer/busybox-windows
 docker push stefanscherer/busybox-windows
-
-npm install -g rebase-docker-image
-rebase-docker-image stefanscherer/busybox-windows -t stefanscherer/busybox-windows:1709 -b microsoft/nanoserver:1709

busybox/push.ps1

@@ -1,14 +1,14 @@
 # escape=`
-ARG tag=10.0.14393.2125
-FROM microsoft/windowsservercore:$tag AS download
-ENV CADDY_VERSION 0.10.12
+ARG tag=ltsc2016
+FROM mcr.microsoft.com/windows/servercore:$tag AS download
+ENV CADDY_VERSION 0.11.5
 RUN powershell -Command $ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue'; `
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; `
     Invoke-WebRequest $('https://github.com/mholt/caddy/releases/download/v{0}/caddy_v{0}_windows_amd64.zip' -f $env:CADDY_VERSION) -OutFile 'caddy.zip' -UseBasicParsing ; `
     Expand-Archive -Path caddy.zip -DestinationPath C:\caddy -Force ; `
     rm caddy.zip
 
-FROM microsoft/nanoserver:$tag
+FROM mcr.microsoft.com/windows/servercore:$tag
 COPY --from=download /caddy /caddy
 
 WORKDIR C:\caddy

caddy/Dockerfile

@@ -17,10 +17,10 @@ Caddy is an awesome standalone [web server](https://caddyserver.com)
 docker build -t caddy .
 ```
 
-On Windows Server 1709 build it with different base image tag.
+On Windows Server 1809 build it with different base image tag.
 
 ```
-docker build --build-arg tag=1709 -t caddy .
+docker build --build-arg tag=1809 -t caddy .
 ```
 
 ## Run the container

caddy/README.md

@@ -1,5 +1,5 @@
 ARG version=ltsc2016
-FROM microsoft/windowsservercore:$version
+FROM mcr.microsoft.com/windows/servercore:$version
 
 ENV chocolateyUseWindowsCompression false
 

chocolatey/Dockerfile

@@ -12,15 +12,15 @@ Jump start into Chocolatey in a Windows container.
 docker build -t chocolatey .
 ```
 
-## Build for 1709
+## Build for 1803
 
 ```
-docker build --build-arg version=1709 -t chocolatey .
+docker build --build-arg version=1803 -t chocolatey .
 ```
 
-## Build for 1803
+
+## Build for 2016 LTSC
 
 ```
-docker build --build-arg version=1803 -t chocolatey .
+docker build --build-arg version=ltsc2019 -t chocolatey .
 ```
-

chocolatey/README.md

@@ -2,7 +2,7 @@ version: "3.5"
 
 services:
   test:
-    image: microsoft/windowsservercore:1709
+    image: mcr.microsoft.com/windows/servercore:ltsc2019
     volumes:
       - type: bind
         source: C:\Users\stefan\.ssh

compose-issue-5371/bind/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.2"
 
 services:
   test:
-    image: microsoft/windowsservercore
+    image: mcr.microsoft.com/windows/servercore
     volumes:
       - type: bind
         source: C:\Users\stefan\.ssh

compose-issue-5371/docker-compose.yml

@@ -1,6 +1,6 @@
 # escape=`
-FROM microsoft/nanoserver:sac2016 as download
-ENV CONSUL_VERSION 1.4.0
+FROM mcr.microsoft.com/windows/servercore:ltsc2016 as download
+ENV CONSUL_VERSION 1.4.4
 
 RUN powershell -Command $ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue'; `
     Invoke-WebRequest $('https://releases.hashicorp.com/consul/{0}/consul_{0}_windows_amd64.zip' -f $env:CONSUL_VERSION) -OutFile 'consul.zip' -UseBasicParsing ; `
@@ -9,7 +9,7 @@ RUN powershell -Command $ErrorActionPreference = 'Stop'; $ProgressPreference = '
     mkdir C:\download\consul\data ; `
     mkdir C:\download\consul\config
 
-FROM microsoft/nanoserver:sac2016
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 COPY --from=download /download /
 
 # Expose the consul data directory as a volume since there's mutable state in there.

consul/Dockerfile

@@ -1,32 +1,5 @@
 $version=$(select-string -Path Dockerfile -Pattern "ENV CONSUL_VERSION").ToString().split()[-1]
-docker tag consul stefanscherer/consul-windows:$version-1607
-docker push stefanscherer/consul-windows:$version-1607
-
-npm install -g rebase-docker-image
-rebase-docker-image `
-  stefanscherer/consul-windows:$version-1607 `
-  -t stefanscherer/consul-windows:$version-1709 `
-  -b microsoft/nanoserver:1709
-rebase-docker-image `
-  stefanscherer/consul-windows:$version-1607 `
-  -t stefanscherer/consul-windows:$version-1803 `
-  -b microsoft/nanoserver:1803
-rebase-docker-image `
-  stefanscherer/consul-windows:$version-1607 `
-  -s microsoft/nanoserver:sac2016 `
-  -t stefanscherer/consul-windows:$version-1809 `
-  -b stefanscherer/netapi-helper:1809
-
-..\update-docker-cli.ps1
-
-docker manifest create `
-  stefanscherer/consul-windows:$version `
-  stefanscherer/consul-windows:$version-1607 `
-  stefanscherer/consul-windows:$version-1709
-docker manifest push stefanscherer/consul-windows:$version
-
-docker manifest create `
-  stefanscherer/consul-windows:latest `
-  stefanscherer/consul-windows:$version-1607 `
-  stefanscherer/consul-windows:$version-1709
-docker manifest push stefanscherer/consul-windows:latest
+docker tag consul stefanscherer/consul-windows:$version
+docker push stefanscherer/consul-windows:$version
+docker tag consul stefanscherer/consul-windows:latest
+docker push stefanscherer/consul-windows:latest

consul/push.ps1

@@ -1,10 +1,10 @@
-FROM microsoft/nanoserver:10.0.14393.2068 AS download
-ENV CURL_VERSION 7.58.0
+FROM mcr.microsoft.com/windows/servercore:ltsc2016 AS download
+ENV CURL_VERSION 7.64.1
 WORKDIR /curl
 ADD https://skanthak.homepage.t-online.de/download/curl-$CURL_VERSION.cab curl.cab
 RUN expand /R curl.cab /F:* .
 
-FROM microsoft/nanoserver:10.0.14393.2068
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 COPY --from=download /curl/AMD64/ /
 COPY --from=download /curl/CURL.LIC /
 ENTRYPOINT ["curl.exe"]

curl/Dockerfile

@@ -3,9 +3,9 @@
 
 curl in a Windows NanoServer container
 
-Sometimes I need `curl.exe` inside a Windows NanoServer container to test inter-container networking. Here is a Docker image for it.
+Sometimes I need `curl.exe` inside a Windows ServerCore container to test inter-container networking. Here is a Docker image for it.
 
-It is a multi-OS Docker image so you can run it on Windows Server 2016 LTS as well as on Windows Server 1709. You need Docker 17.10.0 EE preview 3 to make the automatic OS selection work.
+Notice: In Windows Nanoserver and ServerCore images beginning with 1803 curl.exe and tar.exe are always available.
 
 ```
 docker run stefanscherer/curl-windows

curl/README.md

@@ -1,20 +1,5 @@
 $version=$(select-string -Path Dockerfile -Pattern "ENV CURL_VERSION").ToString().split()[-1]
-docker tag curl stefanscherer/curl-windows:$version-1607
-docker push stefanscherer/curl-windows:$version-1607
-
-npm install -g rebase-docker-image
-rebase-docker-image stefanscherer/curl-windows:$version-1607 -t stefanscherer/curl-windows:$version-1709 -b microsoft/nanoserver:1709
-
-..\update-docker-cli.ps1
-
-docker manifest create `
-  stefanscherer/curl-windows:$version `
-  stefanscherer/curl-windows:$version-1607 `
-  stefanscherer/curl-windows:$version-1709
-docker manifest push stefanscherer/curl-windows:$version
-
-docker manifest create `
-  stefanscherer/curl-windows:latest `
-  stefanscherer/curl-windows:$version-1607 `
-  stefanscherer/curl-windows:$version-1709
-docker manifest push stefanscherer/curl-windows:latest
+docker tag curl stefanscherer/curl-windows:$version
+docker push stefanscherer/curl-windows:$version
+docker tag curl stefanscherer/curl-windows:latest
+docker push stefanscherer/curl-windows:latest

curl/push.ps1

@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.2068
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diskspd/Dockerfile

@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:10.0.14393.2068
+FROM mcr.microsoft.com/windows/nanoserver:10.0.14393.2068
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diskspd/Dockerfile.nano

@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore as download
+FROM mcr.microsoft.com/windows/servercore:ltsc2016 as download
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -12,6 +12,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
     Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing
 RUN /innoextract.exe dockertoolbox.exe
 
-FROM microsoft/nanoserver:sac2016
+FROM mcr.microsoft.com/windows/nanoserver:sac2016
 COPY --from=download /app/docker.exe /
 CMD [ "docker.exe" ]

docker-cli/Dockerfile

@@ -3,7 +3,7 @@
 
 To test the Docker API from inside a Windows container it sometimes is useful to have the Docker CLI.
 
-Especially for Windows Server 1709 it's easy to access the Docker API of the host
+Especially since Windows Server 1709 it's easy to access the Docker API of the host
 
 ```
 docker run -v //./pipe/docker_engine://./pipe/docker_engine -u ContainerAdministrator stefanscherer/docker-cli-windows docker version