summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Weickelt <richard@weickelt.de>2019-10-23 23:57:49 +0200
committerRichard Weickelt <richard@weickelt.de>2019-10-24 16:17:16 +0000
commitc743186550d23d85cafe1983d1e2d5ecdd317345 (patch)
treee37d035f4aef0181f78b273d308f4195bf58916c
parent29625b18b6eac46fba6691a47049afb1add3d8a8 (diff)
Update build environment and Bionic Docker image
Update also the docs to refer to the Ubuntu image rather than Debian. Change-Id: I2c64f8f169c7a8ff9d5090ebc55c56bffd957659 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--.travis.yml2
-rw-r--r--doc/qbs.qdoc8
-rw-r--r--docker-compose.yml4
3 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index d37139695..208ae94a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
global:
- QT_INSTALL_DIR=~/Qt
- QT_VERSION=5.12.5
- - QTCREATOR_VERSION=4.9.2
+ - QTCREATOR_VERSION=4.10.1
stages:
- name: Build Qbs and and run autotests
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc
index 08a901365..852329f73 100644
--- a/doc/qbs.qdoc
+++ b/doc/qbs.qdoc
@@ -712,17 +712,17 @@
\li Latest stable release of \QBS for building \QBS with \QBS
\endlist
- Run the following command to download the \QBS development image based on Debian 9 \e Stretch:
+ Run the following command to download the \QBS development image based on Ubuntu 18.04 \e Bionic:
\code
- docker pull qbsbuild/qbsdev:stretch
+ docker pull qbsbuild/qbsdev:bionic
\endcode
You can then create a new container with the \QBS source directory mounted from your host
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:bionic
\endcode
You will now be in an interactive Linux shell where you can develop and build \QBS.
@@ -730,7 +730,7 @@
For convenience, you can also run \c docker-compose from the project root directory:
\code
- docker-compose run --rm stretch
+ docker-compose run --rm bionic
\endcode
This will download and run the container in one go and mount the project root directory
diff --git a/docker-compose.yml b/docker-compose.yml
index c29d09462..885c9c70c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,13 +12,13 @@ services:
bionic:
<< : *linux
hostname: bionic
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.13.1-2
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.14.0-0
build:
dockerfile: docker/bionic/Dockerfile
context: .
args:
QT_VERSION: 5.12.5
- QTCREATOR_VERSION: 4.9.2
+ QTCREATOR_VERSION: 4.10.1
stretch:
<< : *linux