Skip to content

Commit

Permalink
Update base image 2068
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanScherer committed Feb 16, 2018
1 parent 6b13c7b commit 717e48f
Show file tree
Hide file tree
Showing 38 changed files with 114 additions and 36 deletions.
2 changes: 1 addition & 1 deletion dsc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068
COPY test.ps1 test.ps1
RUN powershell .\test.ps1
2 changes: 1 addition & 1 deletion getaddrinfo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# regression test for https://github.com/docker/docker/issues/15889

FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

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

Expand Down
2 changes: 1 addition & 1 deletion git-for-windows-issue/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/nanoserver:10.0.14393.2007
FROM microsoft/nanoserver:10.0.14393.2068

ENV GIT_VERSION 2.15.1
ENV GIT_PATCH_VERSION 2
Expand Down
10 changes: 10 additions & 0 deletions git-for-windows-issue/Dockerfile.insider
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM microsoft/nanoserver-insider:10.0.17046.1000

ENV GIT_VERSION 2.15.1
ENV GIT_PATCH_VERSION 2

RUN powershell -Command $ErrorActionPreference = 'Stop' ; \
Invoke-WebRequest $('https://github.com/git-for-windows/git/releases/download/v{0}.windows.{1}/MinGit-{0}.{1}-busybox-64-bit.zip' -f $env:GIT_VERSION, $env:GIT_PATCH_VERSION) -OutFile 'mingit.zip' -UseBasicParsing ; \
Expand-Archive mingit.zip -DestinationPath c:\mingit ; \
Remove-Item mingit.zip -Force ; \
setx /M PATH $('c:\mingit\cmd;{0}' -f $env:PATH)
47 changes: 47 additions & 0 deletions golang/Dockerfile.1709
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
FROM microsoft/windowsservercore:1709 AS builder

# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
SHELL ["powershell.exe", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ENV GOLANG_VERSION 1.9

RUN $url = ('https://golang.org/dl/go{0}.windows-amd64.zip' -f $env:GOLANG_VERSION); \
Write-Host ('Downloading {0} ...' -f $url); \
Invoke-WebRequest -Uri $url -OutFile 'go.zip'; \
\
$sha256 = '874b144b994643cff1d3f5875369d65c01c216bb23b8edddf608facc43966c8b'; \
Write-Host ('Verifying sha256 ({0}) ...' -f $sha256); \
if ((Get-FileHash go.zip -Algorithm sha256).Hash -ne $sha256) { \
Write-Host 'FAILED!'; \
exit 1; \
}; \
\
Write-Host 'Expanding ...'; \
Expand-Archive go.zip -DestinationPath C:\; \
\
Write-Host 'Removing ...'; \
Remove-Item go.zip -Force; \
\
Write-Host 'Complete.';

ENV GIT_VERSION 2.14.1
ENV GIT_DOWNLOAD_URL https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/MinGit-${GIT_VERSION}-64-bit.zip
ENV GIT_SHA256 65c12e4959b8874187b68ec37e532fe7fc526e10f6f0f29e699fa1d2449e7d92

RUN Invoke-WebRequest -UseBasicParsing $env:GIT_DOWNLOAD_URL -OutFile git.zip; \
if ((Get-FileHash git.zip -Algorithm sha256).Hash -ne $env:GIT_SHA256) {exit 1} ; \
Expand-Archive git.zip -DestinationPath C:\git; \
Remove-Item git.zip

FROM microsoft/nanoserver:1709

COPY --from=builder /go /go
COPY --from=builder /git /git

# ideally, this would be C:\go to match Linux a bit closer, but C:\go is the recommended install path for Go itself on Windows
ENV GOPATH C:\\gopath
WORKDIR $GOPATH

USER ContainerAdministrator
RUN setx /m PATH "%PATH%;C:\%GOPATH%\bin;C:\go\bin;C:\git\cmd;C:\git\mingw64\bin;C:\git\usr\bin"
USER ContainerUser
2 changes: 1 addition & 1 deletion golang/Dockerfile.devel
Original file line number Diff line number Diff line change
Expand Up @@ -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.2007
FROM microsoft/nanoserver:10.0.14393.2068
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ENV GOPATH C:\\gopath
RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
Expand Down
2 changes: 1 addition & 1 deletion iis/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This dockerfile utilizes components licensed by their respective owners/authors.

FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

LABEL Description="IIS" Vendor="Microsoft" Version="10"

Expand Down
2 changes: 1 addition & 1 deletion java/openjdk/azul/nanoserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/nanoserver:10.0.14393.2007
FROM microsoft/nanoserver:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion java/openjdk/azul/windowsservercore/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion java/openjdk/ojdkbuild/windowsservercore/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion java/openjdk/redhat/nanoserver/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/nanoserver:10.0.14393.2007
FROM microsoft/nanoserver:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion java/openjdk/redhat/windowsservercore/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion java/openjdk/redhat/windowsservercore/Dockerfile.install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion mongo/3.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068
MAINTAINER [email protected]

ENV MONGO_MAJOR 3.0
Expand Down
2 changes: 1 addition & 1 deletion mongo/3.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

ENV MONGO_VERSION=3.2.11

Expand Down
2 changes: 1 addition & 1 deletion mongo/3.2/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

ENV MONGO_VERSION 3.2.11

Expand Down
2 changes: 1 addition & 1 deletion mongo/3.2/nano/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/nanoserver:10.0.14393.2007
FROM microsoft/nanoserver:10.0.14393.2068

ENV MONGO_VERSION=3.2.11

Expand Down
4 changes: 2 additions & 2 deletions mongo/3.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/windowsservercore:10.0.14393.2007 as msi
FROM microsoft/windowsservercore:10.0.14393.2068 as msi

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand All @@ -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.2007
FROM microsoft/nanoserver:10.0.14393.2068

COPY --from=msi C:\mongodb\ C:\mongodb\
COPY --from=msi C:\windows\system32\msvcp140.dll C:\windows\system32
Expand Down
4 changes: 2 additions & 2 deletions mongo/3.4/enterprise/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/windowsservercore:10.0.14393.2007 as msi
FROM microsoft/windowsservercore:10.0.14393.2068 as msi

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand All @@ -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.2007
FROM microsoft/nanoserver:10.0.14393.2068

COPY --from=msi C:\mongodb\ C:\mongodb\
COPY --from=msi C:\windows\system32\msvcp140.dll C:\windows\system32
Expand Down
2 changes: 1 addition & 1 deletion nanoserverapiscan/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion nanoserverapiscan/Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion nanoserverapiscan/build.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
docker create --name nano microsoft/nanoserver:10.0.14393.2007
docker create --name nano microsoft/nanoserver:10.0.14393.2068
mkdir tmp
docker cp nano:Windows/System32/Forwarders tmp
docker build -t win10sdk -f Dockerfile.build .
Expand Down
2 changes: 1 addition & 1 deletion nodejs-node-8897/libuv/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
18 changes: 18 additions & 0 deletions nodejs-node-8897/libuv/Dockerfile.from.scratch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM microsoft/windowsservercore

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

# Install all build tools with Chocolatey + npm module
ENV chocolateyUseWindowsCompression false
RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'));
RUN choco install -y nodejs -version 8.9.0
RUN choco install -y git -params "/GitAndUnixToolsOnPath"
RUN npm install --global --production windows-build-tools
RUN $env:PATH += ';{0}\.windows-build-tools\python27' -f $env:USERPROFILE ; \
[Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)

# Clone specific libuv version and run the tests
RUN git clone v1.15.0 https://github.com/libuv/libuv.git
WORKDIR libuv

# CMD .\vcbuild.bat test
Binary file added nodejs-node-8897/libuv/run-tests.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion nodejs-node-8897/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

Expand Down
2 changes: 1 addition & 1 deletion openssl/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068
MAINTAINER [email protected]

ENV OPENSSL_VERSION 1.1.0.60000000
Expand Down
2 changes: 1 addition & 1 deletion poshspec/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

ENV POSHSPEC_VERSION 2.2.1

Expand Down
2 changes: 1 addition & 1 deletion powercli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

ENV POWERCLI_VERSION 6.5.4.7155375

Expand Down
3 changes: 3 additions & 0 deletions powercli/sslexceptions.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PS C:\Users\ContainerAdministrator\AppData\Roaming\VMware\PowerCLI> cat .\SslCertificateExceptions.csv
roecloud001.sealsystems.local,8D269555A9011CE7EC84ABC59569C04D712489FE
10.100.20.29,8D269555A9011CE7EC84ABC59569C04D712489FE
2 changes: 1 addition & 1 deletion powershell-50-characters/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068
WORKDIR "Program Files"
RUN rd /S /Q WindowsPowerShell\Modules\PSReadLine
WORKDIR /
2 changes: 1 addition & 1 deletion powershell-50-characters/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2007
FROM microsoft/windowsservercore:10.0.14393.2068
WORKDIR "Program Files"
RUN rd /S /Q WindowsPowerShell\Modules\PSReadLine
WORKDIR /
Expand Down
2 changes: 1 addition & 1 deletion printcommandline/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

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
Expand Down
2 changes: 1 addition & 1 deletion procmon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

RUN reg add "HKCU\SOFTWARE\Sysinternals\Process Monitor" /v EulaAccepted /t REG_DWORD /d 1
ADD https://live.sysinternals.com/procmon.exe procmon.exe
4 changes: 2 additions & 2 deletions prometheus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# escape=`
FROM microsoft/windowsservercore:10.0.14393.2007 AS tar
FROM microsoft/windowsservercore:10.0.14393.2068 AS tar
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]

ENV MHOLT_ARCHIVER_VERSION 2.0
Expand All @@ -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.2007
FROM microsoft/nanoserver:10.0.14393.2068

COPY --from=tar /download/prometheus.exe /bin/prometheus.exe
COPY --from=tar /download/promtool.exe /bin/promtool.exe
Expand Down
2 changes: 1 addition & 1 deletion quotes/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/windowsservercore:10.0.14393.2007
FROM microsoft/windowsservercore:10.0.14393.2068

RUN powershell -Command $a = \"world\" ; $b = \"hello \"\"$a\"\"\" ; Write-Host \"'$b'\"

Expand Down
2 changes: 1 addition & 1 deletion quotes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.2007
Step 1/5 : FROM microsoft/windowsservercore:10.0.14393.2068
---> 93a9c37b36d0
Step 2/5 : RUN powershell -Command $a = \"world\" ; $b = \"hello \"\"$a\"\"\" ; Write-Host \"'$b'\"
---> Running in 8a5ea6ced75c
Expand Down
2 changes: 1 addition & 1 deletion realpath/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.2007
FROM microsoft/windowsservercore:10.0.14393.2068
COPY --from=build /code/x64/release/realpath.exe realpath.exe
CMD [ "/realpath.exe" ]

0 comments on commit 717e48f

Please sign in to comment.