diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-08-22 12:12:34 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-07 08:29:58 +0000 |
| commit | bd2c6175c81d77c07441b1da55c808f7696b67db (patch) | |
| tree | e3647c36e3f239a799632d458c0154fe736f053f /docker | |
| parent | 8e2813ca061f318e78e2b1df153c53f50e9a2067 (diff) | |
| download | qbs-bd2c6175c81d77c07441b1da55c808f7696b67db.tar.gz | |
Docker/Windows: use a simpler workaround for UNC paths in release script
This should make release builds faster since all of the source files
don't need to be copied to a temporary directory. Qbs is also updated to
1.9 since another bug was fixed in that version which prevented from
building when the Qbs sources were located in the root of a drive.
Change-Id: I9d333dd0e0bf1fafc72cff093c90f8d0111162b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
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 |