diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-10-26 13:22:27 +0300 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-10-26 13:22:27 +0300 |
| commit | e811681b9024b42fe6d064f2e2e37392f6093b86 (patch) | |
| tree | b27724cb432036c4f119309dc7d27381a26872c7 /docker-compose.yml | |
| parent | 05c46fbeb5256eb0935b49d1d05197a448e49830 (diff) | |
| parent | 24044d6da5d3f3725adc134fdb7e71fe398381ff (diff) | |
Merge branch '1.21' into master
Change-Id: I3417bbe182c23f8e6a9704b008eb8a5618e4d175
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 77a79f2b1..315330dbc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -84,6 +84,17 @@ services: QT_VERSION: 6.0.0 ANDROID_NDK_VERSION: 23.0.7599858 + focal-android-620: + << : *linux + hostname: focal-android + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-android-6.2.0-0 + build: + dockerfile: docker/focal/test-android.Dockerfile + context: . + args: + QT_VERSION: 6.2.0 + ANDROID_NDK_VERSION: 23.0.7599858 + focal-android-ndk-r19c: << : *linux hostname: focal-android |