diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-26 20:32:56 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-28 10:43:14 +0000 |
| commit | 1b968db404c0869784c82bd1968b54988d11648e (patch) | |
| tree | a858e3e0da1228d4ec1aa5afc1136e8daf0fc9b5 | |
| parent | fb7760cbd7896aaa00e05ece8f4c1a34c532d887 (diff) | |
travis: install cap'n'proto packages in Bionic image
This allows to run capnproto tests on Linux
Change-Id: I1c500063f13f4aecc16c088f91d3ce790c750abf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | docker/bionic/Dockerfile | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 2e87be195..cd0bad7d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: bionic: << : *linux hostname: bionic - image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.15.0_1.15.1-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.15.0_1.15.1-1 build: dockerfile: docker/bionic/Dockerfile context: . diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile index d81714329..ab05c90a7 100644 --- a/docker/bionic/Dockerfile +++ b/docker/bionic/Dockerfile @@ -38,6 +38,7 @@ RUN apt-get update -qq && \ bison \ build-essential \ ca-certificates \ + capnproto \ ccache \ clang-8 \ clang-tidy-8 \ @@ -46,6 +47,7 @@ RUN apt-get update -qq && \ git \ help2man \ icoutils \ + libcapnp-dev \ libdbus-1-3 \ libfreetype6 \ libfontconfig1 \ |