Skip to content

Move default include files where protoc can find them #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2019
Merged

Move default include files where protoc can find them #288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Dockerfiles/CI/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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