diff options
author | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-10-03 20:04:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 20:04:20 +0200 |
commit | 37cf0282e482c2777413cc103e4d1c4d76c9047e (patch) | |
tree | c0b3f7df3d6aa0944396337092df2077e8f6bb10 | |
parent | 43f562dcadd22f7256926a84e8cf391578517ef2 (diff) | |
parent | aa2822c46e74ac8c5ca267d8ada6ac7f05ffca31 (diff) |
Merge pull request #8266 from jtattermusch/fix_go_docker_interop
Fix building go interop image
-rwxr-xr-x | tools/dockerfile/interoptest/grpc_interop_go/build_interop.sh | 13 |
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) |