diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-11 17:09:56 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-11 17:09:56 +0300 |
| commit | ebd9464c98c101842ada9f8ea4e67ca33838bc58 (patch) | |
| tree | 1bc183ae30522ed3ada975682e0a6dfa1ac8e940 /docker-compose.yml | |
| parent | a1f4ffa99d3778c5ca70dfc1bfb453a69d769173 (diff) | |
| parent | 97c7f802ef065b6133fc075d1559ede4952bf872 (diff) | |
| download | qbs-ebd9464c98c101842ada9f8ea4e67ca33838bc58.tar.gz | |
Merge branch '2.0' into master
Change-Id: I0322637bf5e81873da34f36e108611b163076e5f
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 11ce33e24..bd1284198 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,24 +21,24 @@ services: focal-qt5: &focal-qt5 << : *linux hostname: focal-qt5 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.20.1-2 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.24.1-0 build: dockerfile: docker/focal/Dockerfile context: . args: QT_VERSION: 5.15.2 - QTCREATOR_VERSION: 5.0.3 + QTCREATOR_VERSION: 9.0.2 focal-qt6: << : *linux hostname: focal-qt6 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.2.4_1.20.1-1 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.5.0_1.24.1-0 build: dockerfile: docker/focal/Dockerfile context: . args: - QT_VERSION: 6.2.4 - QTCREATOR_VERSION: 5.0.3 + QT_VERSION: 6.5.0 + QTCREATOR_VERSION: 9.0.2 focal: << : *focal-qt5 |