aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile/interoptest/grpc_interop_go
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-10-03 19:47:37 +0200
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-10-03 19:47:37 +0200
commitaa2822c46e74ac8c5ca267d8ada6ac7f05ffca31 (patch)
tree3af1b681eeafb354d96173af606d3dcd3416367c /tools/dockerfile/interoptest/grpc_interop_go
parentecc5a40bd32a5f633d158496a0291b4081c70849 (diff)
fix building go interop image
Diffstat (limited to 'tools/dockerfile/interoptest/grpc_interop_go')
-rwxr-xr-xtools/dockerfile/interoptest/grpc_interop_go/build_interop.sh13
1 files changed, 3 insertions, 10 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh
index 1fd088322c..858ee0a68c 100755
--- a/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh
+++ b/tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh
@@ -36,19 +36,12 @@ set -e
# to test instead of using "go get" to download from Github directly.
git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc
+# Get all gRPC Go dependencies
+(cd src/google.golang.org/grpc && go get -t .)
+
# copy service account keys if available
cp -r /var/local/jenkins/service_account $HOME || true
-# Get dependencies from GitHub
-# NOTE: once grpc-go dependencies change, this needs to be updated manually
-# but we don't expect this to happen any time soon.
-go get github.com/golang/protobuf/proto
-go get golang.org/x/net/context
-go get golang.org/x/net/trace
-go get golang.org/x/oauth2
-go get golang.org/x/oauth2/google
-go get google.golang.org/cloud
-
# Build the interop client and server
(cd src/google.golang.org/grpc/interop/client && go install)
(cd src/google.golang.org/grpc/interop/server && go install)