commit e3975e72d2e58cbcfcd4cd76db9066fce381593a
author yang-g <yangg@google.com> Mon May 30 12:53:56 2016 -0700
committer yang-g <yangg@google.com> Mon May 30 15:13:19 2016 -0700
tree d27edeaa3ffa82ba405810826e58d81ba91460af
parent 420999857523b88e00652c143a03c82b26b32c57

Move grpc installation from docker file to script.

test/distrib/cpp/run_distrib_test.sh

diff --git a/test/distrib/cpp/run_distrib_test.sh b/test/distrib/cpp/run_distrib_test.sh
index 7b6418d..5c21a1e 100755
--- a/test/distrib/cpp/run_distrib_test.sh
+++ b/test/distrib/cpp/run_distrib_test.sh
@@ -30,7 +30,13 @@
 
 set -ex
 
-cd $EXTERNAL_GIT_ROOT
+git clone https://github.com/grpc/grpc.git
+cd grpc && git submodule update --init
+
+cd third_party/protobuf && ./autogen.sh && \
+./configure && make -j12 && make check && make install && ldconfig
+
+cd ../.. && make -j12 && make install
 
 cd examples/cpp/helloworld
 

tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile

diff --git a/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile b/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
index 4bbbddd..b02208f 100644
--- a/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
@@ -42,12 +42,4 @@
       pkg-config \
       unzip && apt-get clean
 
-RUN git clone https://github.com/grpc/grpc.git
-RUN cd grpc && git submodule update --init
-
-RUN cd grpc/third_party/protobuf && ./autogen.sh && \
-    ./configure && make -j12 && make check && make install && ldconfig
-
-RUN cd grpc && make -j12 && make install
-
 CMD ["bash"]