aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Qi Zhao <toqizhao@gmail.com>2015-03-02 17:04:30 -0800
committerGravatar Qi Zhao <toqizhao@gmail.com>2015-03-02 17:04:30 -0800
commit4705a5a01ab675c03be473f40923c56e72f0138f (patch)
treecc839a8d6155002a300b0f59fb7308f8a7e63b92 /tools
parentfa054b37a19bb063121d2e3dd1bc9530a12c8c35 (diff)
Revert "dockerfiles/go: go install from GOPATH and remove bash from CMD"
Diffstat (limited to 'tools')
-rw-r--r--tools/dockerfile/grpc_go/Dockerfile6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/dockerfile/grpc_go/Dockerfile b/tools/dockerfile/grpc_go/Dockerfile
index ada2208097..06bb3e2d5e 100644
--- a/tools/dockerfile/grpc_go/Dockerfile
+++ b/tools/dockerfile/grpc_go/Dockerfile
@@ -37,8 +37,8 @@ RUN go get google.golang.org/grpc
ADD service_account service_account
# Build the interop client and server
-RUN go install google.golang.org/grpc/interop/client
-RUN go install google.golang.org/grpc/interop/server
+RUN cd src/google.golang.org/grpc/interop/client && go install
+RUN cd src/google.golang.org/grpc/interop/server && go install
# Specify the default command such that the interop server runs on its known testing port
-CMD ["server", "--use_tls=true", "--port=8020"]
+CMD ["/bin/bash", "-c", "cd src/google.golang.org/grpc/interop/server && go run server.go --use_tls=true --port=8020"]