diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-03-17 13:24:27 +0100 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-03-26 12:13:20 +0000 |
| commit | 92b39d31334b7503c5ab37713b2077b5e0fb64c3 (patch) | |
| tree | 3670a9ba6288d7897f365fdacff242182d5951aa /docker | |
| parent | 215ceb0393e890367a40c6bec7236bd9162cf088 (diff) | |
Use docker-compose exclusively for managing Docker images
Qbs used to have docker products and a module for building the images, but this
became obsolet and was superseded by the docker-compose infrastructure.
Docker-compose is a much better fit for our use-case (which is mostly CI). It
allows us to use unique (and complicated) tags both when building and running
the images without exposing that to the user. Unique tags like
bionic-5.12.6_1.14.1-2 instead of just bionic ensure that changes in the
infrastructure don't suddenly break builds in older branches using the same
image.
This patch also updates the documentation to emphasize the usage of
docker-compose.
Change-Id: I45335d37034d10dda5ab5079ee3be1f81cb3e5c5
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/docker.qbs | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/docker/docker.qbs b/docker/docker.qbs index 752c61d3b..513a5fd8b 100644 --- a/docker/docker.qbs +++ b/docker/docker.qbs @@ -1,34 +1,8 @@ -import qbs -Project { - Product { - Depends { name: "docker"; required: false } - - name: "qbs-docker-stretch" - type: ["docker.docker-image"] - builtByDefault: false - condition: docker.present - - docker.imageTag: "qbsbuild/qbsdev:stretch" - - files: [ - "stretch/Dockerfile", - "stretch/entrypoint.sh", - ] - } - - Product { - Depends { name: "docker"; required: false } - - name: "qbs-docker-windowsservercore" - type: ["docker.docker-image"] - builtByDefault: false - condition: docker.present - - docker.imageTag: "qbsbuild/qbsdev:windowsservercore" - - files: [ - "windowsservercore/Dockerfile", - ] - } +// This is a convenience product to be able to use Qt Creator for editing the docker files. +// For building and managing the images, use docker-compose as explained in +// https://doc.qt.io/qbs/building-qbs.html#using-docker. +Product { + name: "docker" + files: "**" } |