Update to 10.0.14393.2007

StefanScherer · Jan 6, 2018 · 1bc69ad · 1bc69ad
1 parent 935e86c
commit 1bc69ad
Show file tree

Hide file tree

Showing 45 changed files with 55 additions and 53 deletions.
diff --git a/CVE-2017-0290/Dockerfile b/CVE-2017-0290/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 RUN powershell -command wget -useb -outfile testcase.js https://bugs.chromium.org/p/project-zero/issues/attachment?aid=283405
 

diff --git a/caddy/Dockerfile b/caddy/Dockerfile
@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 ENV CADDY_VERSION 0.10.10
 RUN powershell -Command $ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue'; `
     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 ; `

diff --git a/chocolatey/Dockerfile b/chocolatey/Dockerfile
@@ -3,4 +3,5 @@ FROM microsoft/windowsservercore:10.0.14393.1944
 ENV chocolateyUseWindowsCompression false
 
 RUN powershell -Command \
-    iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'));
+    iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
+    choco feature disable --name showDownloadProgress
diff --git a/consul/Dockerfile b/consul/Dockerfile
@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/nanoserver:10.0.14393.1770 as download
+FROM microsoft/nanoserver:10.0.14393.2007 as download
 ENV CONSUL_VERSION 1.0.0
 
 RUN powershell -Command $ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue'; `
@@ -9,7 +9,7 @@ RUN powershell -Command $ErrorActionPreference = 'Stop'; $ProgressPreference = '
     mkdir C:\download\consul\data ; `
     mkdir C:\download\consul\config
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 COPY --from=download /download /
 
 # Expose the consul data directory as a volume since there's mutable state in there.

diff --git a/diskspd/Dockerfile b/diskspd/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/diskspd/Dockerfile.nano b/diskspd/Dockerfile.nano
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/docker-cli/Dockerfile b/docker-cli/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:10.0.14393.1770 as download
+FROM microsoft/nanoserver:10.0.14393.2007 as download
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -11,6 +11,6 @@ RUN Invoke-WebRequest $('https://download.docker.com/win/static/edge/x86_64/dock
     Remove-Item -Path docker.zip ; \
     Remove-Item -Path docker\dockerd.exe
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 COPY --from=download docker/docker.exe /
 CMD [ "docker.exe" ]
diff --git a/dockertls/Dockerfile b/dockertls/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/dsc/Dockerfile b/dsc/Dockerfile
@@ -1,3 +1,3 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 COPY test.ps1 test.ps1
 RUN powershell .\test.ps1
diff --git a/getaddrinfo/Dockerfile b/getaddrinfo/Dockerfile
@@ -1,6 +1,6 @@
 # regression test for https://github.com/docker/docker/issues/15889
 
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 RUN powershell -Command Sleep 2 ; wget -Uri https://github.com/StefanScherer/win-getaddrinfo/releases/download/1.0.8/getaddrinfo.exe -OutFile C:\Windows\system32\getaddrinfo.exe -UseBasicParsing
 

diff --git a/golang/Dockerfile.devel b/golang/Dockerfile.devel
@@ -7,7 +7,7 @@ ENV GOROOT_BOOTSTRAP C:/go1.8.1
 ENV CGO_ENABLED 0
 RUN cmd /C make.bat
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 ENV GOPATH C:\\gopath
 RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \

diff --git a/iis/Dockerfile b/iis/Dockerfile
@@ -1,6 +1,6 @@
 # This dockerfile utilizes components licensed by their respective owners/authors.
 
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 LABEL Description="IIS" Vendor="Microsoft" Version="10"
 

diff --git a/java/openjdk/azul/nanoserver/Dockerfile b/java/openjdk/azul/nanoserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/java/openjdk/azul/windowsservercore/Dockerfile b/java/openjdk/azul/windowsservercore/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/java/openjdk/ojdkbuild/windowsservercore/Dockerfile b/java/openjdk/ojdkbuild/windowsservercore/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/java/openjdk/redhat/nanoserver/Dockerfile b/java/openjdk/redhat/nanoserver/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/java/openjdk/redhat/windowsservercore/Dockerfile b/java/openjdk/redhat/windowsservercore/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/java/openjdk/redhat/windowsservercore/Dockerfile.install b/java/openjdk/redhat/windowsservercore/Dockerfile.install
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/mongo/3.0/Dockerfile b/mongo/3.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 MAINTAINER scherer_stefan@icloud.com
 
 ENV MONGO_MAJOR 3.0

diff --git a/mongo/3.2/Dockerfile b/mongo/3.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 ENV MONGO_VERSION=3.2.11
 

diff --git a/mongo/3.2/Dockerfile.build b/mongo/3.2/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 ENV MONGO_VERSION 3.2.11
 

diff --git a/mongo/3.2/nano/Dockerfile b/mongo/3.2/nano/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 ENV MONGO_VERSION=3.2.11
 

diff --git a/mongo/3.4/Dockerfile b/mongo/3.4/Dockerfile
@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/windowsservercore:10.0.14393.1770 as msi
+FROM microsoft/windowsservercore:10.0.14393.2007 as msi
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -17,7 +17,7 @@ RUN if ((Get-FileHash mongodb.msi -Algorithm sha256).Hash -ne $env:MONGO_DOWNLOA
 RUN Start-Process msiexec.exe -ArgumentList '/i', 'mongodb.msi', '/quiet', '/norestart', 'INSTALLLOCATION=C:\mongodb', 'ADDLOCAL=Server,Client,MonitoringTools,ImportExportTools,MiscellaneousTools' -NoNewWindow -Wait
 RUN Remove-Item C:\mongodb\bin\*.pdb
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 COPY --from=msi C:\mongodb\ C:\mongodb\
 COPY --from=msi C:\windows\system32\msvcp140.dll C:\windows\system32

diff --git a/mongo/3.4/enterprise/Dockerfile b/mongo/3.4/enterprise/Dockerfile
@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/windowsservercore:10.0.14393.1770 as msi
+FROM microsoft/windowsservercore:10.0.14393.2007 as msi
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -17,7 +17,7 @@ RUN if ((Get-FileHash mongodb.msi -Algorithm sha256).Hash -ne $env:MONGO_DOWNLOA
 RUN Start-Process msiexec.exe -ArgumentList '/i', 'mongodb.msi', '/quiet', '/norestart', 'INSTALLLOCATION=C:\mongodb', 'ADDLOCAL=Server,Client,MonitoringTools,ImportExportTools,MiscellaneousTools' -NoNewWindow -Wait
 RUN Remove-Item C:\mongodb\bin\*.pdb
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 COPY --from=msi C:\mongodb\ C:\mongodb\
 COPY --from=msi C:\windows\system32\msvcp140.dll C:\windows\system32

diff --git a/msbuild/Dockerfile b/msbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/nanoserverapiscan/Dockerfile b/nanoserverapiscan/Dockerfile
@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/nanoserverapiscan/Dockerfile.build b/nanoserverapiscan/Dockerfile.build
@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 

diff --git a/nanoserverapiscan/build.ps1 b/nanoserverapiscan/build.ps1
@@ -1,9 +1,7 @@
-docker rm -f nano 2>nul
-docker create --name nano microsoft/nanoserver
+docker create --name nano microsoft/nanoserver:10.0.14393.2007
 mkdir tmp
 docker cp nano:Windows/System32/Forwarders tmp
 docker build -t win10sdk -f Dockerfile.build .
-docker rm -f win10sdk 2>nul
 docker create --name win10sdk win10sdk
 mkdir tmp\kit\um\x64
 mkdir tmp\kit\ucrt\x64

diff --git a/nodejs-node-8897/libuv/Dockerfile b/nodejs-node-8897/libuv/Dockerfile
@@ -1,10 +1,11 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV chocolateyUseWindowsCompression false
 
-RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'));
+RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
+    choco feature disable --name showDownloadProgress
 
 RUN choco install -y nodejs -version 7.3.0
 RUN choco install -y git -params "/GitAndUnixToolsOnPath"

diff --git a/nodejs-node-8897/node/Dockerfile b/nodejs-node-8897/node/Dockerfile
@@ -1,10 +1,11 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV chocolateyUseWindowsCompression false
 
-RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'));
+RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
+    choco feature disable --name showDownloadProgress
 
 RUN choco install -y nodejs -version 7.3.0
 RUN choco install -y git -params "/GitAndUnixToolsOnPath"

diff --git a/openssl/Dockerfile b/openssl/Dockerfile
@@ -5,6 +5,7 @@ ENV chocolateyUseWindowsCompression false
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \
+    choco feature disable --name showDownloadProgress ; \
     choco install -y openssl.light
 
 WORKDIR "C:\\Program Files\\OpenSSL\\bin"

diff --git a/powershell-50-characters/Dockerfile b/powershell-50-characters/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 WORKDIR "Program Files"
 RUN rd /S /Q WindowsPowerShell\Modules\PSReadLine
 WORKDIR /
diff --git a/powershell-50-characters/README.md b/powershell-50-characters/README.md
@@ -20,7 +20,7 @@ Now paste your clipboard into it (I also can repro it from my Mac pasting it int
 A fix could be removing PSReadLine from windowsservercore until it is fixed in PSReadLine module.
 
 ```Dockerfile
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 WORKDIR "Program Files"
 RUN rd /S /Q WindowsPowerShell\Modules\PSReadLine
 WORKDIR /

diff --git a/printcommandline/Dockerfile b/printcommandline/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 RUN powershell.exe -Command Sleep 2 ; wget -Uri https://github.com/StefanScherer/win-print-commandline/releases/download/1.0.3/printcommandline.exe -OutFile printcommandline.exe -UseBasicParsing
 RUN printcommandline.exe C:\Program Files

diff --git a/prometheus/Dockerfile b/prometheus/Dockerfile
@@ -1,5 +1,5 @@
 # escape=`
-FROM microsoft/windowsservercore:10.0.14393.1770 AS tar
+FROM microsoft/windowsservercore:10.0.14393.2007 AS tar
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
 ENV MHOLT_ARCHIVER_VERSION 2.0
@@ -14,7 +14,7 @@ RUN Invoke-WebRequest $('https://github.com/prometheus/prometheus/releases/downl
 RUN .\archiver.exe open prometheus.tar.gz
 RUN Rename-Item -Path $('C:\prometheus-{0}.windows-amd64' -f $env:PROMETHEUS_VERSION) -NewName 'C:\download'
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 COPY --from=tar /download/prometheus.exe      /bin/prometheus.exe
 COPY --from=tar /download/promtool.exe        /bin/promtool.exe

diff --git a/python/Dockerfile b/python/Dockerfile
@@ -1,7 +1,7 @@
 # escape=`
 FROM python:3.6-windowsservercore AS python
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 COPY --from=python /Python /Python
 

diff --git a/quotes/Dockerfile b/quotes/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 RUN powershell -Command $a = \"world\" ; $b = \"hello \"\"$a\"\"\" ; Write-Host \"'$b'\"
 

diff --git a/quotes/README.md b/quotes/README.md
@@ -30,7 +30,7 @@ It is still not a PowerShell script, but a `powershell.exe -Command` call where
 ```
 $ docker build --no-cache -t test3 .
 Sending build context to Docker daemon 2.048 kB
-Step 1/5 : FROM microsoft/windowsservercore:10.0.14393.1770
+Step 1/5 : FROM microsoft/windowsservercore:10.0.14393.2007
  ---> 93a9c37b36d0
 Step 2/5 : RUN powershell -Command $a = \"world\" ; $b = \"hello \"\"$a\"\"\" ; Write-Host \"'$b'\"
  ---> Running in 8a5ea6ced75c

diff --git a/realpath/Dockerfile b/realpath/Dockerfile
@@ -1,6 +1,6 @@
 FROM stefanscherer/msbuild:14.0 as build
 COPY . .
 RUN msbuild realpath.sln /p:Configuration=Release /p:Platform=x64
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 COPY --from=build /code/x64/release/realpath.exe realpath.exe
 CMD [ "/realpath.exe" ]
diff --git a/spaces/Dockerfile b/spaces/Dockerfile
@@ -1,2 +1,2 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 COPY [ "Sub Dir", "C:/Program Files (x86)/Sub Dir" ]
diff --git a/spaces/README.md b/spaces/README.md
@@ -3,7 +3,7 @@
 How to use spaces in Dockerfiles
 
 ```Dockerfile
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 COPY [ "Sub Dir", "C:/Program Files (x86)/Sub Dir" ]
 ```
 

diff --git a/swarm/Dockerfile b/swarm/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /go/src/github.com/docker/swarm
 RUN git checkout $env:SWARM_VERSION
 RUN go install .
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 COPY --from=build /go/src/github.com/docker/swarm/swarm.exe /swarm.exe
 

diff --git a/testvolume/Dockerfile b/testvolume/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/windowsservercore:10.0.14393.1770
+FROM microsoft/windowsservercore:10.0.14393.2007
 
 ADD ./config /config
 

diff --git a/webserver/Dockerfile b/webserver/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /code
 
 RUN go build webserver.go
 
-FROM microsoft/nanoserver:10.0.14393.1770
+FROM microsoft/nanoserver:10.0.14393.2007
 
 COPY --from=gobuild /code/webserver.exe /webserver.exe
 

diff --git a/webserver/test.ps1 b/webserver/test.ps1
@@ -1,3 +1,3 @@
-docker run --name webserver -p 8080:8080 -d webserver
+docker run --name webserver -p 8088:8080 -d webserver
 Start-Sleep -Seconds 5
 docker logs webserver