aboutsummaryrefslogtreecommitdiffstats
path: root/docker-compose.yml
diff options
context:
space:
mode:
Diffstat (limited to 'docker-compose.yml')
-rw-r--r--docker-compose.yml15
1 files changed, 13 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 152f35af6..d38a826dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,13 +21,13 @@ services:
focal:
<< : *linux
hostname: focal
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.19.2-0
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.20.1-0
build:
dockerfile: docker/focal/Dockerfile
context: .
args:
QT_VERSION: 5.15.2
- QTCREATOR_VERSION: 4.15.2
+ QTCREATOR_VERSION: 5.0.2
focal-qt6:
<< : *linux
@@ -40,6 +40,17 @@ services:
QT_VERSION: 6.2.0
QTCREATOR_VERSION: 5.0.2
+ focal-qt6-static:
+ << : *linux
+ hostname: focal-qt6-static
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-static-6.2.0_1.20.1-0
+ build:
+ dockerfile: docker/focal/test-qt6-static.Dockerfile
+ context: .
+ args:
+ QT_VERSION: 6.2.0
+ QTCREATOR_VERSION: 5.0.2
+
focal-android-513:
<< : *linux
hostname: focal-android