aboutsummaryrefslogtreecommitdiffstats
path: root/docker-compose.yml
diff options
context:
space:
mode:
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml37
1 files changed, 26 insertions, 11 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index bff8f5d87..cdfa6ee55 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,32 @@
-version: "3.3"
+version: "3.7"
+
+x-default-service: &linux
+ working_dir: /qbs
+ volumes:
+ - .:/qbs
+ network_mode: bridge
+ cap_add:
+ - SYS_PTRACE
services:
+ bionic:
+ << : *linux
+ hostname: bionic
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic
+ build:
+ dockerfile: docker/bionic/Dockerfile
+ context: .
+ args:
+ QT_VERSION: 5.12.4
+ QTCREATOR_VERSION: 4.9.2
+
stretch:
+ << : *linux
+ hostname: stretch
image: ${DOCKER_USER:-qbsbuild}/qbsdev:stretch
build:
- dockerfile: Dockerfile
- context: docker/stretch/
+ dockerfile: docker/stretch/Dockerfile
+ context: .
args:
- QT_VERSION: 5.11.3
- QBS_VERSION: 1.13.0
- working_dir: /qbs
- volumes:
- - .:/qbs
- network_mode: bridge
- cap_add:
- - SYS_PTRACE
+ QT_VERSION: 5.12.4
+ QTCREATOR_VERSION: 4.9.2