From 7d5b1027edccdf9680a8b7c86a587e929ecae2c9 Mon Sep 17 00:00:00 2001
From: Tim Emiola <temiola@google.com>
Date: Thu, 22 Jan 2015 12:09:50 -0800
Subject: [PATCH] Updates java_base to pull in protobuf

---
 tools/dockerfile/grpc_java_base/Dockerfile | 7 +++++++
 1 file changed, 7 insertions(+)

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
 
-- 
GitLab