diff options
| author |  Donna Dionne <donnadionne@google.com> | 2015-01-23 15:59:10 -0800 |
|---|---|---|
| committer | Donna Dionne <donnadionne@google.com> | 2015-01-23 16:15:48 -0800 |
| commit | f06fd4c4dd3b21fba6592e6458529e47cbf63393 (patch) | |
| tree | c932019e2f6702cb401b44ac588bc46fe48d6420 /tools | |
| parent | fb6714cf7697d8b633ff678fd1fae1667590095f (diff) | |
Adding Docker support for cpp
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/grpc_cxx/Dockerfile | 13 | ||||
| -rwxr-xr-x | tools/gce_setup/grpc_docker.sh | 12 |
2 files changed, 22 insertions, 3 deletions
diff --git a/tools/dockerfile/grpc_cxx/Dockerfile b/tools/dockerfile/grpc_cxx/Dockerfile index ea3a1dba8f..8d8a1cf3ac 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,12 @@ 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 +#RUN make install -C /var/local/git/grpc + +RUN cd /var/local/git/grpc && ls \ + && make clean \ + && make gens/test/cpp/util/messages.pb.cc \ + && make interop_client \ + && make interop_server -# Define the default command. -CMD ["bash"] +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 |