aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker-compose.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index e00b641c1..13b4f6a2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,24 +21,24 @@ services:
focal:
<< : *linux
hostname: focal
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.17.1-1
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.18.2-0
build:
dockerfile: docker/focal/Dockerfile
context: .
args:
QT_VERSION: 5.15.2
- QTCREATOR_VERSION: 4.13.3
+ QTCREATOR_VERSION: 4.14.2
focal-qt6:
<< : *linux
hostname: focal-qt6
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.0.2_1.18.1-0
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.0.2_1.18.2-0
build:
dockerfile: docker/focal/Dockerfile
context: .
args:
QT_VERSION: 6.0.2
- QTCREATOR_VERSION: 4.14.1
+ QTCREATOR_VERSION: 4.14.2
focal-android-513:
<< : *linux
@@ -97,13 +97,13 @@ services:
context: .
windows:
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.15.0_1.16.0-0
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.15.0_1.18.2-0
build:
dockerfile: docker/windowsservercore/Dockerfile
context: .
args:
QT_VERSION: 5.15.0
- QBS_VERSION: 1.16.0
+ QBS_VERSION: 1.18.2
working_dir: 'C:/qbs'
environment:
- BUILD_OPTIONS