diff options
author | Richard Weickelt <richard@weickelt.de> | 2019-05-23 21:24:20 +0200 |
---|---|---|
committer | Richard Weickelt <richard@weickelt.de> | 2019-08-27 04:41:42 +0000 |
commit | 52f4eccf83d8c0f4519216fede7e8311fd275f70 (patch) | |
tree | 754bc40a68118ac6a6e9d68fa31026fa54b7ff2a /docker-compose.yml | |
parent | c6e49568deaf973df276d5168714df0c9a2aad85 (diff) | |
download | qbs-52f4eccf83d8c0f4519216fede7e8311fd275f70.tar.gz |
Add Ubuntu 18.04 Docker image
Contains:
- Qbs 1.13.1 (from QtCreator 4.9.2)
- Qt 5.12.4 for Linux (prebuilt)
- Qt 5.12.4 for Windows (compiled from source)
- gcc 7.4
- mingw-w64 (7.3)
This image can build Qbs and all its components for Linux
and Windows targets. It might supersede Debian stretch which
is not officially supported by Qt 5.12.
The only limitation is that it can neither build Chocolatey
packages nor run windeployqt.
Change-Id: Icee1f002483f68839d39c8c152a9c5d886dabcfb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker-compose.yml')
-rw-r--r-- | docker-compose.yml | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 251b09679..cdfa6ee55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,28 @@ -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: docker/stretch/Dockerfile @@ -9,9 +30,3 @@ services: args: QT_VERSION: 5.12.4 QTCREATOR_VERSION: 4.9.2 - working_dir: /qbs - volumes: - - .:/qbs - network_mode: bridge - cap_add: - - SYS_PTRACE |