aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2020-03-30 12:55:34 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-04-02 12:19:17 +0000
commit2b16a3786c284a44c296754838cf5ab3504089e2 (patch)
tree13cbbfe60c6ec865771ee66e5928644318c699b7
parentd91f6cd85f8cddc8f829297d02a2a75647b50f1a (diff)
Install libgrpc++-dev packages in Bionic image
This enables autotesting the GRPC test in Travis (otherwise, headers are missing and IncludeProbe fails to find them) Change-Id: I77792a2c5dbfc3f73020b7964cca3274a5165c3c Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--docker-compose.yml2
-rw-r--r--docker/bionic/Dockerfile1
2 files changed, 2 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 198de4b56..e26beed00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
bionic:
<< : *linux
hostname: bionic
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.6_1.14.1-4
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.6_1.14.1-5
build:
dockerfile: docker/bionic/Dockerfile
context: .
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index 0a702109c..204c27606 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -137,6 +137,7 @@ RUN apt-get update -qq && \
libgl1-mesa-dev \
libgl1-mesa-glx \
libprotobuf-dev \
+ libgrpc++-dev \
nsis \
pkg-config \
protobuf-compiler \