diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-12-01 01:13:38 -0800 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-12-05 17:07:11 +0000 |
commit | 59ebab680f40d032b2d2090edee90c2b26089a98 (patch) | |
tree | 3d4925193a9418b22ba97d04655f019df74ed1c5 /docker/windowsservercore | |
parent | 4feb787437f64243c9f3c91de0f89a317c61acde (diff) |
Update Docker images with the latest software
Change-Id: I360fbab406a0bd82dd0a09462585681625c1539c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker/windowsservercore')
-rw-r--r-- | docker/windowsservercore/Dockerfile | 15 | ||||
-rw-r--r-- | docker/windowsservercore/qtifwsilent.qs | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile index d3c7c1afd..bc194d59e 100644 --- a/docker/windowsservercore/Dockerfile +++ b/docker/windowsservercore/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/windowsservercore:10.0.14393.1715 +FROM microsoft/windowsservercore:10.0.14393.1884 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 @@ -9,20 +9,21 @@ COPY qtifwsilent.qs C:\qtifwsilent.qs RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ $ErrorActionPreference = 'Stop'; \ $Wc = New-Object System.Net.WebClient ; \ - $Wc.DownloadFile('https://download.qt.io/official_releases/qt/5.9/5.9.1/qt-opensource-windows-x86-5.9.1.exe', 'C:\qt.exe') ; \ - Echo 'Downloaded qt-opensource-windows-x86-5.9.1.exe' ; \ + $Wc.DownloadFile('https://download.qt.io/official_releases/qt/5.9/5.9.3/qt-opensource-windows-x86-5.9.3.exe', 'C:\qt.exe') ; \ + Echo 'Downloaded qt-opensource-windows-x86-5.9.3.exe' ; \ $Env:QT_INSTALL_DIR = 'C:\\Qt' ; \ Start-Process C:\qt.exe -ArgumentList '--verbose --script C:/qtifwsilent.qs' -NoNewWindow -Wait ; \ Remove-Item C:\qt.exe -Force ; \ Remove-Item C:\qtifwsilent.qs -Force -ENV QTDIR C:\\Qt\\5.9.1\\msvc2015 -ENV QTDIR64 C:\\Qt\\5.9.1\\msvc2015_64 +ENV QTDIR C:\\Qt\\5.9.3\\msvc2015 +ENV QTDIR64 C:\\Qt\\5.9.3\\msvc2015_64 +RUN dir "%QTDIR%" && dir "%QTDIR64%" && dir "%QTDIR%\bin\Qt5Script.dll" && dir "%QTDIR64%\bin\Qt5Script.dll" RUN @powershell -NoProfile -ExecutionPolicy Bypass -Command \ - $Env:chocolateyVersion = '0.10.5' ; \ + $Env:chocolateyVersion = '0.10.8' ; \ $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.9.0 && qbs --version +RUN choco install -y qbs --version 1.9.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 diff --git a/docker/windowsservercore/qtifwsilent.qs b/docker/windowsservercore/qtifwsilent.qs index 4d6c698cd..13b5f39ea 100644 --- a/docker/windowsservercore/qtifwsilent.qs +++ b/docker/windowsservercore/qtifwsilent.qs @@ -24,8 +24,10 @@ Controller.prototype.TargetDirectoryPageCallback = function() { Controller.prototype.ComponentSelectionPageCallback = function() { var widget = gui.currentPageWidget(); - widget.selectComponent("qt.591.win32_msvc2015"); - widget.selectComponent("qt.591.win64_msvc2015_64"); + widget.deselectAll(); + widget.selectComponent("qt.593.win32_msvc2015"); + widget.selectComponent("qt.593.win64_msvc2015_64"); + widget.selectComponent("qt.593.qtscript"); widget.selectComponent("qt.tools.vcredist_msvc2015_x86"); widget.selectComponent("qt.tools.vcredist_msvc2015_x64"); gui.clickButton(buttons.NextButton); |