diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-28 15:47:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-28 15:47:52 +0200 |
| commit | 811edc5952caf265a4c56b52933165830838dab1 (patch) | |
| tree | 787ef28916e4799083aa1b7e0d5076a35d130eca /docker | |
| parent | 40787b4d077eea1211f43d9f247c560957bd6887 (diff) | |
| parent | 0f647796788494947632c0874931e4d84bccad46 (diff) | |
Merge 1.9 into master
Change-Id: I5320b7c62d6a80089df75c2caca79c15602c01e5
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/windowsservercore/Dockerfile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile index 0e6e78e60..942ecbd2b 100644 --- a/docker/windowsservercore/Dockerfile +++ b/docker/windowsservercore/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/windowsservercore:10.0.14393.1358 +FROM microsoft/windowsservercore:10.0.14393.1480 LABEL Description="Windows Server Core development environment for Qbs with Qt 5.9, Chocolatey and various dependencies for testing Qbs modules and functionality" # Disable crash dialog for release-mode runtimes @@ -22,7 +22,7 @@ RUN @powershell -NoProfile -ExecutionPolicy Bypass -Command \ $Env:chocolateyVersion = '0.10.5' ; \ $Env:chocolateyUseWindowsCompression = 'false' ; \ "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin" -RUN choco install -y qbs --version 1.8.1 -RUN choco install -y unzip --version 6.0 -RUN choco install -y visualcpp-build-tools --version 14.0.25420.1 -RUN choco install -y zip --version 3.0 +RUN choco install -y qbs --version 1.8.1 && qbs --version +RUN choco install -y unzip --version 6.0 && unzip -v +RUN choco install -y visualcpp-build-tools --version 14.0.25420.1 && dir "%PROGRAMFILES(X86)%\Microsoft Visual C++ Build Tools" +RUN choco install -y zip --version 3.0 && zip -v |