Skip to content

Commit 54095c9

Browse files
authored
move default include files where protoc can find them (#288)
1 parent 3d797f5 commit 54095c9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Diff for: Dockerfiles/CI/Dockerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM golang:1.12
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
4-
bzip2 \
5-
unzip \
4+
bzip2 \
5+
unzip \
66
&& rm -rf /var/lib/apt/lists/*
77

88
ENV PROTOBUF_VER 3.8.0
@@ -20,5 +20,8 @@ RUN set -ex \
2020
&& go get github.com/golang/protobuf/protoc-gen-go \
2121
&& mkdir protobuf && cd protobuf \
2222
&& curl -LO https://github.com/google/protobuf/releases/download/v$PROTOBUF_VER/protoc-$PROTOBUF_VER-linux-x86_64.zip \
23-
&& unzip protoc-$PROTOBUF_VER-linux-x86_64.zip && cp ./bin/* /bin/ \
23+
&& unzip protoc-$PROTOBUF_VER-linux-x86_64.zip \
24+
&& cp ./bin/* /bin/ \
25+
# protoc will search for default includes in the path of the binary
26+
&& cp -r ./include /bin/ \
2427
&& cd .. && rm -rf protobuf

0 commit comments

Comments
 (0)