summaryrefslogtreecommitdiff
path: root/docker/docker.qbs
diff options
context:
space:
mode:
authorRichard Weickelt <richard@weickelt.de>2020-02-06 22:59:32 +0100
committerRichard Weickelt <richard@weickelt.de>2020-03-17 09:37:10 +0000
commit19befa84eded82c98e0cd27b97af087cc7ff5074 (patch)
tree3bb1300dc06d7c7c12a9729d7b33861e2778469b /docker/docker.qbs
parent77e8cca24ee4c39da5f2cbafbc316f9ac9e8ac80 (diff)
downloadqbs-19befa84eded82c98e0cd27b97af087cc7ff5074.tar.gz
Update windowsservercore Docker image
Qt is updated to 5.12.5, MSVC is updated to 2017. Qbs is updated to 1.15.0. Docker-compose is used for managing the image. A unique tag name is used instead of the generic windowsservercore tag to be always able to refer to a specific version. Docker-compose is now used for managing the image. Change-Id: Ia5733992e7692561b1a6e74a4ac2ea3a7a01c4d8 Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker/docker.qbs')
-rw-r--r--docker/docker.qbs1
1 files changed, 0 insertions, 1 deletions
diff --git a/docker/docker.qbs b/docker/docker.qbs
index 5adc277e4..752c61d3b 100644
--- a/docker/docker.qbs
+++ b/docker/docker.qbs
@@ -29,7 +29,6 @@ Project {
files: [
"windowsservercore/Dockerfile",
- "windowsservercore/build-qt.bat",
]
}
}