diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-11 12:36:24 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-11 12:36:55 +0200 |
| commit | 4ba79af3bb8ba4bc21fc857b5f8863f099c88fee (patch) | |
| tree | 86ca07ef43e5cee1f5a013f49d244861dbdc1484 /docker | |
| parent | 4c5f973ffb3e1cc30d4227df79ec8a69995c6996 (diff) | |
| parent | 520fe8cc897a91a466f97f510db7b0c2343a83f9 (diff) | |
Merge remote-tracking branch 'origin/1.9' into master
Change-Id: Ib18e50ecdc9be5f9deaebf68414c2082ddafcc8b
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/windowsservercore/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile index 942ecbd2b..561116c3f 100644 --- a/docker/windowsservercore/Dockerfile +++ b/docker/windowsservercore/Dockerfile @@ -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 && qbs --version +RUN choco install -y qbs --version 1.9.0 && 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 |