diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-07-09 02:07:55 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-07-10 16:19:53 +0000 |
| commit | a216557fe2cdab15e4c4fbc76be0ddcd13ed8086 (patch) | |
| tree | 850cc73d88638e828c53298300e41c5dd2e3e478 /docker/windowsservercore/Dockerfile | |
| parent | c0a2e524fa8be3c9609eac5f3e966f614ef0725f (diff) | |
Update Docker image to Windows 10.0.14393.1358, Qt 5.9, and Qbs 1.8.1
Change-Id: Ie09780e1674663013aef09ec7ab98095538f0f59
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker/windowsservercore/Dockerfile')
| -rw-r--r-- | docker/windowsservercore/Dockerfile | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/docker/windowsservercore/Dockerfile b/docker/windowsservercore/Dockerfile index db4c8e14c..0e6e78e60 100644 --- a/docker/windowsservercore/Dockerfile +++ b/docker/windowsservercore/Dockerfile @@ -1,27 +1,28 @@ -FROM microsoft/windowsservercore:10.0.14393.1198 -LABEL Description="Windows Server Core development environment for Qbs with Qt 5.8, Chocolatey and various dependencies for testing Qbs modules and functionality" +FROM microsoft/windowsservercore:10.0.14393.1358 +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 +RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v Disabled /t REG_DWORD /d 1 /f +RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /t REG_DWORD /d 1 /f COPY qtifwsilent.qs C:\qtifwsilent.qs RUN powershell -NoProfile -ExecutionPolicy Bypass -Command \ $ErrorActionPreference = 'Stop'; \ - wget 'https://download.qt.io/official_releases/qt/5.8/5.8.0/qt-opensource-windows-x86-msvc2015-5.8.0.exe' -OutFile C:\qt32.exe ; \ - wget 'https://download.qt.io/official_releases/qt/5.8/5.8.0/qt-opensource-windows-x86-msvc2015_64-5.8.0.exe' -OutFile C:\qt64.exe ; \ - $Env:QT_INSTALL_DIR = 'C:\\Qt_5.8.0_msvc2015' ; Start-Process C:\qt32.exe -ArgumentList '--script C:/qtifwsilent.qs' -Wait ; \ - $Env:QT_INSTALL_DIR = 'C:\\Qt_5.8.0_msvc2015_64' ; Start-Process C:\qt64.exe -ArgumentList '--script C:/qtifwsilent.qs' -Wait ; \ - Remove-Item C:\qt32.exe -Force ; \ - Remove-Item C:\qt64.exe -Force ; \ + $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' ; \ + $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.8.0_msvc2015\\5.8\\msvc2015 -ENV QTDIR64 C:\\Qt_5.8.0_msvc2015_64\\5.8\\msvc2015_64 +ENV QTDIR C:\\Qt\\5.9.1\\msvc2015 +ENV QTDIR64 C:\\Qt\\5.9.1\\msvc2015_64 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.0 +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 - -# Disable crash dialog for release-mode runtimes -RUN reg add "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting" /v DontShowUI /t REG_DWORD /d 1 /f |