diff options
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index b8b4528c9..901d28b93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ x-default-service: &linux working_dir: /qbs environment: - BUILD_OPTIONS + - QTEST_FUNCTION_TIMEOUT + - QBS_AUTOTEST_PROFILE volumes: - .:/qbs - ~/.ccache:/home/devel/.ccache @@ -15,12 +17,12 @@ services: bionic: << : *linux hostname: bionic - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.8_1.15.1-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.15.0_1.15.1-1 build: dockerfile: docker/bionic/Dockerfile context: . args: - QT_VERSION: 5.12.8 + QT_VERSION: 5.15.0 QTCREATOR_VERSION: 4.11.2 bionic-android-513: @@ -43,14 +45,22 @@ services: args: QT_VERSION: 5.14.0 + focal-baremetal: + << : *linux + hostname: focal-baremetal + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-0 + build: + dockerfile: docker/focal/test-baremetal.Dockerfile + context: . + windows: - image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.12.7_1.15.0-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.15.0_1.16.0-0 build: dockerfile: docker/windowsservercore/Dockerfile context: . args: - QT_VERSION: 5.12.7 - QBS_VERSION: 1.15.0 + QT_VERSION: 5.15.0 + QBS_VERSION: 1.16.0 working_dir: 'C:/qbs' environment: - BUILD_OPTIONS |