From b776a1996d56cb5233f98e83b7603c391fbe25db Mon Sep 17 00:00:00 2001
From: Tim Emiola <temiola@google.com>
Date: Fri, 23 Jan 2015 05:19:57 -0800
Subject: [PATCH] Updates the Go dockerfile to reflect the package
restructuring.
- also corrects an error in the Go client test command
---
tools/dockerfile/grpc_go/Dockerfile | 8 ++++----
tools/gce_setup/grpc_docker.sh | 9 +++++----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/tools/dockerfile/grpc_go/Dockerfile b/tools/dockerfile/grpc_go/Dockerfile
index ab463b2a00..1b998152a7 100644
--- a/tools/dockerfile/grpc_go/Dockerfile
+++ b/tools/dockerfile/grpc_go/Dockerfile
@@ -17,11 +17,11 @@ RUN echo 'StrictHostKeyChecking no' >> $HOME/.ssh/config
RUN git config --global url."git@github.com:".insteadOf "https://github.com/"
# Get the source from GitHub
-RUN go get github.com/google/grpc-go
+RUN go get github.com/google/grpc-go/rpc
# Build the interop client and server
-RUN cd src/github.com/google/grpc-go/interop/client && go install
-RUN cd src/github.com/google/grpc-go/interop/server && go install
+RUN cd src/github.com/google/grpc-go/rpc/interop/client && go install
+RUN cd src/github.com/google/grpc-go/rpc/interop/server && go install
# Specify the default command such that the interop server runs on its known testing port
-CMD ["/bin/bash", "-c 'cd src/github.com/google/grpc-go/interop/server && go run server.go --use_tls=true --port=8020'"]
+CMD ["/bin/bash", "-c", "cd src/github.com/google/grpc-go/rpc/interop/server && go run server.go --use_tls=true --port=8020"]
diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh
index bfa4c808be..e61c83b36f 100755
--- a/tools/gce_setup/grpc_docker.sh
+++ b/tools/gce_setup/grpc_docker.sh
@@ -640,10 +640,11 @@ grpc_interop_gen_ruby_cmd() {
# flags= .... # generic flags to include the command
# cmd=$($grpc_gen_test_cmd $flags)
grpc_interop_gen_go_cmd() {
- local cmd_prefix="sudo docker run grpc/go bin/bash -c";
- local test_script="cd /go/src/github.com/google/grpc-go/interop/client";
- local test_script+=" && go run client.go --use_tls=true";
- local the_cmd="$cmd_prefix '$test_script $@ 1>&2'";
+ local cmd_prefix="sudo docker run grpc/go /bin/bash -c"
+ local test_script="cd /go/src/github.com/google/grpc-go/rpc/interop/client"
+ local test_script+=" && go run client.go --use_tls=true"
+ local the_cmd="$cmd_prefix '$test_script $@'"
+ echo $the_cmd
}
# constructs the full dockerized java interop test cmd.
--
GitLab