diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-02-13 22:28:26 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-19 11:42:49 +0000 |
| commit | 49ace4593124456fb066a3eaee83fcbf16b1b804 (patch) | |
| tree | 7b21b9a1e6b36969a0a699409bafba1b48104e68 /docker-compose.yml | |
| parent | 40baf2db26197545cac9ebe810c0399f7b10f0e8 (diff) | |
Add Qt6 docker image and update Qt5 image
...to add additional packages required for the Qt6 image
Change-Id: I42791440eaa754a1ae4ea3c24f86dd0ccedc1ed6
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index f03de93a2..2df603fc5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: focal: << : *linux hostname: focal - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.17.1-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.17.1-1 build: dockerfile: docker/focal/Dockerfile context: . @@ -29,6 +29,17 @@ services: QT_VERSION: 5.15.2 QTCREATOR_VERSION: 4.13.3 + focal-qt6: + << : *linux + hostname: focal-qt6 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.0.2_1.18.1-0 + build: + dockerfile: docker/focal/Dockerfile + context: . + args: + QT_VERSION: 6.0.2 + QTCREATOR_VERSION: 4.14.1 + focal-android-513: << : *linux hostname: focal-android |