From e3975e72d2e58cbcfcd4cd76db9066fce381593a Mon Sep 17 00:00:00 2001
From: yang-g <yangg@google.com>
Date: Mon, 30 May 2016 12:53:56 -0700
Subject: [PATCH] Move grpc installation from docker file to script.
---
test/distrib/cpp/run_distrib_test.sh | 8 +++++++-
tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile | 8 --------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/test/distrib/cpp/run_distrib_test.sh b/test/distrib/cpp/run_distrib_test.sh
index 7b6418db5f..5c21a1e19e 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
diff --git a/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile b/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
index 4bbbddd3b5..b02208faed 100644
--- a/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/cpp_jessie_x64/Dockerfile
@@ -42,12 +42,4 @@ RUN apt-get update && apt-get install -y \
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"]
--
GitLab