aboutsummaryrefslogtreecommitdiffstats
path: root/docker-compose.yml
diff options
context:
space:
mode:
authorRichard Weickelt <richard@weickelt.de>2019-10-06 08:25:32 +0200
committerRichard Weickelt <richard@weickelt.de>2019-10-07 08:58:02 +0000
commitf69cd3ef989b77fce08a421190c549c4341f1e02 (patch)
tree68ed653cd7dcd49837c97785ed1870191f104f86 /docker-compose.yml
parenteed1db08c739fd22eb00e55206eb7b28310d79d0 (diff)
Disable glib event dispatcher in bionic Docker image
Disable glib in the bionic Docker image, as the glib event dispatcher leads to deadlocks in TestBlackbox::concurrentExecutor quite often. The problem should hardly occur in practice. This is a work-around until QTBUG-79020 is fixed. Fixes: QBS-1499 Change-Id: I8cecc979b1c13b053c0ee0787cc4bc0a0de8b701 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 16d9e361a..c29d09462 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
bionic:
<< : *linux
hostname: bionic
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.13.1-1
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.13.1-2
build:
dockerfile: docker/bionic/Dockerfile
context: .