diff options
| author |  Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-01-23 16:47:00 -0800 |
|---|---|---|
| committer | Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-01-23 16:47:00 -0800 |
| commit | 326c0abc1689676ff650305086c58d643e6d81d8 (patch) | |
| tree | 58919365fb83523e650ae5378c746cb16e1ef63d | |
| parent | e1175473fcbcdbb3918c77ad1c67fa442d43c1ab (diff) | |
| parent | aed5642d00aa164f2789eab2314f16bd0248ad07 (diff) | |
Merge pull request #191 from donnadionne/docker
Docker
| -rw-r--r-- | tools/dockerfile/grpc_cxx/Dockerfile | 12 | ||||
| -rwxr-xr-x | tools/gce_setup/grpc_docker.sh | 12 |
2 files changed, 21 insertions, 3 deletions
diff --git a/tools/dockerfile/grpc_cxx/Dockerfile b/tools/dockerfile/grpc_cxx/Dockerfile index ea3a1dba8f..141a20a881 100644 --- a/tools/dockerfile/grpc_cxx/Dockerfile +++ b/tools/dockerfile/grpc_cxx/Dockerfile @@ -1,6 +1,8 @@ # Dockerfile for gRPC C++ FROM grpc/base +RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev + # Get the source from GitHub RUN git clone git@github.com:google/grpc.git /var/local/git/grpc RUN cd /var/local/git/grpc && \ @@ -12,7 +14,11 @@ RUN cd /var/local/git/grpc/third_party/protobuf && \ ./autogen.sh && \ ./configure --prefix=/usr && \ make -j12 && make check && make install && make clean -RUN make install -C /var/local/git/grpc -# Define the default command. -CMD ["bash"] +RUN cd /var/local/git/grpc && ls \ + && make clean \ + && make gens/test/cpp/util/messages.pb.cc \ + && make interop_client \ + && make interop_server + +CMD ["/var/local/git/grpc/bins/opt/interop_server", "--enable_ssl", "--port=8010"] diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh index e61c83b36f..145685305c 100755 --- a/tools/gce_setup/grpc_docker.sh +++ b/tools/gce_setup/grpc_docker.sh @@ -676,5 +676,17 @@ grpc_interop_gen_php_cmd() { echo $the_cmd } +# constructs the full dockerized cpp interop test cmd. +# +# +# call-seq: +# flags= .... # generic flags to include the command +# cmd=$($grpc_gen_test_cmd $flags) +grpc_interop_gen_cxx_cmd() { + local cmd_prefix="sudo docker run grpc/cxx"; + local test_script="/var/local/git/grpc/bins/opt/interop_client --enable_ssl"; + local the_cmd="$cmd_prefix $test_script $@"; + echo $the_cmd +} # TODO(grpc-team): add grpc_interop_gen_xxx_cmd for python|cxx|nodejs |