diff options
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 130 |
1 files changed, 61 insertions, 69 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 152f35af6..d852cc5e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,148 +18,140 @@ x-default-service: &linux - SYS_PTRACE services: - focal: + jammy-qt6: &jammy-qt6 << : *linux - hostname: focal - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-5.15.2_1.19.2-0 + hostname: jammy-qt6 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-qt6-6.5.3_2.1.2-0 build: - dockerfile: docker/focal/Dockerfile + dockerfile: docker/jammy/Dockerfile context: . args: - QT_VERSION: 5.15.2 - QTCREATOR_VERSION: 4.15.2 + QT_VERSION: 6.5.3 + QTCREATOR_VERSION: 11.0.3 - focal-qt6: + jammy-qt5: << : *linux - hostname: focal-qt6 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.2.0_1.20.1-0 + hostname: jammy-qt5 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-5.15.2_2.1.2-0 build: - dockerfile: docker/focal/Dockerfile + dockerfile: docker/jammy/Dockerfile context: . args: - QT_VERSION: 6.2.0 - QTCREATOR_VERSION: 5.0.2 + QT_VERSION: 5.15.2 + QTCREATOR_VERSION: 11.0.3 - focal-android-513: - << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.13.2-3 - build: - dockerfile: docker/focal/test-android.Dockerfile - context: . - args: - QT_VERSION: 5.13.2 - ANDROID_NDK_VERSION: 23.0.7599858 + jammy: + << : *jammy-qt6 - focal-android-514: + jammy-qt6-static: << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.14.0-3 + hostname: jammy-qt6-static + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-qt6-static-6.5.0_2.1.2-0 build: - dockerfile: docker/focal/test-android.Dockerfile + dockerfile: docker/jammy/test-qt6-static.Dockerfile context: . args: - QT_VERSION: 5.14.0 - ANDROID_NDK_VERSION: 23.0.7599858 + QT_VERSION: 6.5.0 + QTCREATOR_VERSION: 11.0.3 - focal-android-515: + jammy-android-515: << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-5.15.1-3 + hostname: jammy-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-5.15.2-0 build: - dockerfile: docker/focal/test-android.Dockerfile + dockerfile: docker/jammy/test-android.Dockerfile context: . args: - QT_VERSION: 5.15.1 + QT_VERSION: 5.15.2 ANDROID_NDK_VERSION: 23.0.7599858 - focal-android-600: + jammy-android-62: << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.0.0-3 + hostname: jammy-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-6.2.4-0 build: - dockerfile: docker/focal/test-android.Dockerfile + dockerfile: docker/jammy/test-android.Dockerfile context: . args: - QT_VERSION: 6.0.0 + QT_VERSION: 6.2.4 ANDROID_NDK_VERSION: 23.0.7599858 - focal-android-620: + jammy-android-65: << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.2.0-0 + hostname: jammy-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-6.5.0-0 build: - dockerfile: docker/focal/test-android.Dockerfile + dockerfile: docker/jammy/test-android.Dockerfile context: . args: - QT_VERSION: 6.2.0 - ANDROID_NDK_VERSION: 23.0.7599858 + QT_VERSION: 6.5.0 + ANDROID_NDK_VERSION: 25.1.8937393 - focal-android-ndk-r19c: + jammy-android-ndk-r19c: << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-ndk-r19c-0 + hostname: jammy-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-ndk-r19c-0 build: - dockerfile: docker/focal/test-android-no-qt.Dockerfile + dockerfile: docker/jammy/test-android-no-qt.Dockerfile context: . args: ANDROID_NDK_VERSION: 19.2.5345600 - focal-android-ndk-r21e: + jammy-android-ndk-r21e: << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-ndk-r21e-0 + hostname: jammy-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-ndk-r21e-0 build: - dockerfile: docker/focal/test-android-no-qt.Dockerfile + dockerfile: docker/jammy/test-android-no-qt.Dockerfile context: . args: ANDROID_NDK_VERSION: 21.4.7075529 - focal-android-ndk-r23: + jammy-android-ndk-r23: << : *linux - hostname: focal-android - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-ndk-r23-0 + hostname: jammy-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-android-ndk-r23-0 build: - dockerfile: docker/focal/test-android-no-qt.Dockerfile + dockerfile: docker/jammy/test-android-no-qt.Dockerfile context: . args: ANDROID_NDK_VERSION: 23.0.7599858 - focal-baremetal: + jammy-baremetal: << : *linux - hostname: focal-baremetal - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-baremetal-4 + hostname: jammy-baremetal + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-baremetal-0 build: - dockerfile: docker/focal/test-baremetal.Dockerfile + dockerfile: docker/jammy/test-baremetal.Dockerfile context: . - focal-qt4: + jammy-qt4: << : *linux - hostname: focal-qt4 - image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt4-0 + hostname: jammy-qt4 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:jammy-qt4-0 build: - dockerfile: docker/focal/test-qt4.Dockerfile + dockerfile: docker/jammy/test-qt4.Dockerfile context: . leap: << : *linux hostname: leap - image: ${DOCKER_USER:-qbsbuild}/qbsdev:leap-5.15.2_1.19.2-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:leap-5.15.2_1.20.1-1 build: dockerfile: docker/leap/Dockerfile context: . args: QT_VERSION: 5.15.2 - QTCREATOR_VERSION: 4.15.2 + QTCREATOR_VERSION: 5.0.3 windows: - image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.15.0_1.18.2-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-6.6.0_1.24.0-0 build: dockerfile: docker/windowsservercore/Dockerfile context: . args: - QT_VERSION: 5.15.0 - QBS_VERSION: 1.18.2 + QT_VERSION: 6.6.0 + QTCREATOR_VERSION: 9.0.1 working_dir: 'C:/qbs' environment: - BUILD_OPTIONS |