diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-26 08:43:55 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-26 08:44:32 +0200 |
commit | 86d69f208f93f048d858125299b9b2639a1f146a (patch) | |
tree | ccc6f3a1960d667e395a5b8fb261589188a965a6 /docker | |
parent | b6a5e43c143dab4bec349fb97d4a6c5589475197 (diff) | |
parent | 70be4ec8d868a5f721c3d1e48b2e527da7178f26 (diff) |
Merge remote-tracking branch 'origin/1.9'
Change-Id: I40c1ea23e7351deac715958783158c089e65a02d
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 561116c3f..d3c7c1afd 100644 --- a/docker/windowsservercore/Dockerfile +++ b/docker/windowsservercore/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/windowsservercore:10.0.14393.1480 +FROM microsoft/windowsservercore:10.0.14393.1715 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 |