diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-04-28 15:05:19 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-04-29 08:05:30 +0000 |
| commit | b9e1fcce6719e6b854b39f52dadc62ec9bc0191b (patch) | |
| tree | 88f8dcb910cdfaf0961dd0f8ecadc22222ed5404 /doc | |
| parent | 5b0271905f491205c6c70eaa33b2c429c13f4536 (diff) | |
Update Debian Stretch Docker image
The Debian Docker image is outdated and the user experience is not optimal,
especially when using it on Linux hosts.
- Update Qt to 5.11.3 and build it from source since the Qt installer
is overly complicated to use
- Create a Qt profile and make it the default
- Add entrypoint script to avoid file permission problems on Linux hosts
- Add docker-compose.yml file for easier command line usage
- Improve documentation
Task-number: QBS-1402
Task-number: QBS-1438
Change-Id: I2cbe53ed115fc8cbb96c1e1305297c581e7d0589
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/qbs.qdoc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index 42146ec6c..0e99d5dae 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -523,8 +523,12 @@ The easiest way to get started is to build \QBS using a Linux container. These types of containers are supported out of the box on all the supported host platforms: Windows, macOS, - and Linux. Run the following to download the \QBS development image based on Debian 9 - \e Stretch: + and Linux. The images provide everything that is necessary to build and test \QBS: + + - Qt SDK for building \QBS with \c qmake + - Latest stable release of \QBS for building \QBS with \QBS + + Run the following to download the \QBS development image based on Debian 9 \e Stretch: \code docker pull qbsbuild/qbsdev:stretch @@ -534,16 +538,19 @@ machine's file system, by running: \code - docker run -it -v $PWD:/qbs -w /qbs qbsbuild/qbsdev:stretch + docker run -it -v ${PWD}:/qbs -w /qbs qbsbuild/qbsdev:stretch \endcode - Or with a slightly different syntax for Windows: + You will now be in an interactive Linux shell where you can develop and build \QBS. + + For convenience, you can also run \c docker-compose from the project root directory: \code - docker run -it -v %CD%:/qbs -w /qbs qbsbuild/qbsdev:stretch + docker-compose run --rm stretch \endcode - You will now be in an interactive Linux shell where you can develop and build \QBS. + This will download and run the container in one go and mount the project root directory + to \c /qbs in the container. \section2 Windows Containers |