diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-19 10:57:25 +0100 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-19 10:57:25 +0100 |
| commit | 36f139c4f405e057baa768e4728704b22de6519d (patch) | |
| tree | 4b554ff21e92698c185d0683b50c7cd742c18817 /docker-compose.yml | |
| parent | 2bc823ec00cec8a1d58981710eb50ba85b4f58d7 (diff) | |
| parent | 7b50dca83a5a75a5c24b5ef329f25990daf2ff50 (diff) | |
Merge branch '1.18'
Change-Id: I4e437865514add88558f66420718bc02fb39e41d
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 9d59800f0..f03de93a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -77,6 +77,14 @@ services: dockerfile: docker/focal/test-baremetal.Dockerfile context: . + focal-qt4: + << : *linux + hostname: focal-qt4 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt4-0 + build: + dockerfile: docker/focal/test-qt4.Dockerfile + context: . + windows: image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.15.0_1.16.0-0 build: |