diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-05-04 12:53:35 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-05-07 09:13:30 +0000 |
| commit | e240504abe490dd9a2d1e905d2b9986bffe8e3ce (patch) | |
| tree | 617fe32493e7965fb369752e4c2c9b1097cd8cc4 /docker-compose.yml | |
| parent | 8abd205199665e4f78032f064246329c0975f2fd (diff) | |
Update and optimize the Docker infrastructure
- Extend Qt installation to enable Qbs autotests and building docs
(QtDeclarative and QtTools, libclang were missing).
- Add Qt to PATH in the container
- Allow users of docker-compose to override the Docker username
so that they can potentially use their own repositories
without changing the file.
- Fix error in the entrypoint script which didn't work when
running the container without arguments.
- Replace the non-interesting output of building Qt with dots because
the log exceeded the maximum log length on Travis CI,
but being entirely silent triggered the watchdog.
Task-number: QBS-1438
Change-Id: Ibd3abacadfc001db5169a9a3fffce908f8e6e760
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 916004e32..ef38ec26d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.3" services: stretch: - image: qbsdev:stretch + image: ${DOCKER_USER:-qbsbuild}/qbsdev:stretch build: dockerfile: Dockerfile context: docker/stretch/ |