diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-15 01:08:32 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2024-02-19 12:12:20 +0000 |
| commit | 589d30c820b155278f4e6d580a1f3fbb50ffc9cc (patch) | |
| tree | de6e856ddadbfb85fbcb20321ae7b618c9eee4a7 /docker-compose.yml | |
| parent | 29f1c4ffbedec0af912c2260e383785b984ed85e (diff) | |
docker: Update static Qt image to Jammy
As well as GitHub actions job.
Change-Id: Ic294a11fa6902f5825a4c73812e1afc0070ffff8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 828a9bc5a..28b4b904a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,6 +32,17 @@ services: jammy: << : *jammy-qt6 + jammy-qt6-static: + << : *linux + hostname: jammy-qt6-static + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-qt6-static-6.5.0_2.1.2-0 + build: + dockerfile: docker/jammy/test-qt6-static.Dockerfile + context: . + args: + QT_VERSION: 6.5.0 + QTCREATOR_VERSION: 11.0.3 + focal-qt5: &focal-qt5 << : *linux hostname: focal-qt5 @@ -57,17 +68,6 @@ services: focal: << : *focal-qt5 - focal-qt6-static: - << : *linux - hostname: focal-qt6-static - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-static-6.5.0_1.24.1-0 - build: - dockerfile: docker/focal/test-qt6-static.Dockerfile - context: . - args: - QT_VERSION: 6.5.0 - QTCREATOR_VERSION: 9.0.2 - focal-android-515: << : *linux hostname: focal-android |