aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Tim Emiola <temiola@google.com>2015-01-22 12:09:50 -0800
committerGravatar Tim Emiola <temiola@google.com>2015-01-26 10:53:50 -0800
commit7d5b1027edccdf9680a8b7c86a587e929ecae2c9 (patch)
tree1db4986760f6bac63aba5cab668a805430b2c93b
parent6ed6036e02c42be3991b971d4018693954bcc281 (diff)
Updates java_base to pull in protobuf
-rw-r--r--tools/dockerfile/grpc_java_base/Dockerfile7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/dockerfile/grpc_java_base/Dockerfile b/tools/dockerfile/grpc_java_base/Dockerfile
index 40be7b1c5b..91ee218b47 100644
--- a/tools/dockerfile/grpc_java_base/Dockerfile
+++ b/tools/dockerfile/grpc_java_base/Dockerfile
@@ -28,6 +28,13 @@ RUN mkdir -p $HOME/.ssh && echo 'Host github.com' > $HOME/.ssh/config
RUN echo " IdentityFile /.ssh/github.rsa" >> $HOME/.ssh/config
RUN echo 'StrictHostKeyChecking no' >> $HOME/.ssh/config
+# Get the protobuf source from GitHub and install it
+RUN git clone --recursive git@github.com:google/protobuf.git /var/local/git/protobuf
+RUN cd /var/local/git/protobuf && \
+ ./autogen.sh && \
+ ./configure --prefix=/usr && \
+ make -j12 && make check && make install && make clean
+
# Get the source from GitHub
RUN git clone --recursive git@github.com:google/grpc-java.git /var/local/git/grpc-java