From 0d52ce22a9bf1d19a4c5590dd17f7f80abb3b6aa Mon Sep 17 00:00:00 2001
From: Richard Weickelt <richard@weickelt.de>
Date: Thu, 15 Aug 2019 07:22:02 +0200
Subject: Switch to Qt installer script in Docker container
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docker-compose.yml')

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
-- 
cgit v1.2.3