From 1c3e61227d7e474bd56cc38fdc259f3cc5d3a661 Mon Sep 17 00:00:00 2001 From: Raphael Cotty Date: Sat, 1 May 2021 16:22:46 +0200 Subject: docker: Update images to Qbs 1.18.2 Qbs 1.21.0 will removes the "product" variable in the Export items after it was deprecated in Qbs 1.18. So in order to build Qbs with Qbs, the installed Qbs version must be updated. Change-Id: Ibee0676823e41defc5d613e486be0a230c431905 Reviewed-by: Ivan Komissarov --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docker-compose.yml') 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 -- cgit v1.2.3