diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-08-15 07:22:02 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-08-23 13:09:43 +0000 |
| commit | 0d52ce22a9bf1d19a4c5590dd17f7f80abb3b6aa (patch) | |
| tree | 26ccee167aacdcc3757f3b0869bf0d16f0f0c423 /docker-compose.yml | |
| parent | 45875ba07926bfb5b60b4604bb9b39dc3abdd474 (diff) | |
Switch to Qt installer script in Docker container
Use the official packages instead of compiling Qt ourselves.
This simplifies the Docker image a lot. For accessing the
script folder, the Docker context needs to change to the
root directory. Thus, we need a .dockerignore file to keep
the size of the context low.
Change-Id: I58ec8f364feba955518f1eaf5bff234332ae8dec
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index bff8f5d87..251b09679 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,11 +4,11 @@ services: stretch: image: ${DOCKER_USER:-qbsbuild}/qbsdev:stretch build: - dockerfile: Dockerfile - context: docker/stretch/ + dockerfile: docker/stretch/Dockerfile + context: . args: - QT_VERSION: 5.11.3 - QBS_VERSION: 1.13.0 + QT_VERSION: 5.12.4 + QTCREATOR_VERSION: 4.9.2 working_dir: /qbs volumes: - .:/qbs |