From a32177fc41d192150d2befee763b3b7aff519040 Mon Sep 17 00:00:00 2001 From: Massimiliano Pippi Date: Wed, 17 Jul 2019 17:32:59 +0200 Subject: [PATCH] move default include files where protoc can find them --- Dockerfiles/CI/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Dockerfiles/CI/Dockerfile b/Dockerfiles/CI/Dockerfile index fd4b9cf4002..2974c51ccad 100644 --- a/Dockerfiles/CI/Dockerfile +++ b/Dockerfiles/CI/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.12 RUN apt-get update && apt-get install -y --no-install-recommends \ - bzip2 \ - unzip \ + bzip2 \ + unzip \ && rm -rf /var/lib/apt/lists/* ENV PROTOBUF_VER 3.8.0 @@ -20,5 +20,8 @@ RUN set -ex \ && go get github.com/golang/protobuf/protoc-gen-go \ && mkdir protobuf && cd protobuf \ && curl -LO https://github.com/google/protobuf/releases/download/v$PROTOBUF_VER/protoc-$PROTOBUF_VER-linux-x86_64.zip \ - && unzip protoc-$PROTOBUF_VER-linux-x86_64.zip && cp ./bin/* /bin/ \ + && unzip protoc-$PROTOBUF_VER-linux-x86_64.zip \ + && cp ./bin/* /bin/ \ + # protoc will search for default includes in the path of the binary + && cp -r ./include /bin/ \ && cd .. && rm -rf protobuf