diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-04-15 22:37:21 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-04-15 22:37:51 +0200 |
| commit | 99d009c0ae5558d86159206e7a27d4ed7e8ade28 (patch) | |
| tree | 31a6917ba50c52c5987f4cec29be24dce2152565 /docker-compose.yml | |
| parent | 7d9c004b9692ee681f4778a1062e40ee1211f7e5 (diff) | |
| parent | 846fc574f38395af24a9e60726372cb56075cff4 (diff) | |
Merge branch '1.16' into master
Change-Id: Ie3f341fe18e2ffaf676721748279c6b027590727
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index e26beed00..2b777c6f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,17 +43,6 @@ services: args: QT_VERSION: 5.14.0 - stretch: - << : *linux - hostname: stretch - image: ${DOCKER_USER:-qbsbuild}/qbsdev:stretch - build: - dockerfile: docker/stretch/Dockerfile - context: . - args: - QT_VERSION: 5.12.4 - QTCREATOR_VERSION: 4.9.2 - windows: image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-5.12.7_1.15.0-0 build: |