diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-30 01:52:19 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-30 01:52:19 +0200 |
| commit | f173793e51e726a887b84b4c37588e2e308191cc (patch) | |
| tree | 0c03feb8ebdb68a99c51d3f24c3aa39755f14793 /tools/dockerfile/grpc_python/Dockerfile | |
| parent | 882d7a7eec148046a90e1d111b93e353e3df0c31 (diff) | |
| parent | 1685d773ef81420bf747c6988a2ad9baefd126fa (diff) | |
Merge branch 'master' of github.com:grpc/grpc into travis-speedup
Conflicts:
.travis.yml
Diffstat (limited to 'tools/dockerfile/grpc_python/Dockerfile')
| -rw-r--r-- | tools/dockerfile/grpc_python/Dockerfile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/dockerfile/grpc_python/Dockerfile b/tools/dockerfile/grpc_python/Dockerfile index 62ef785a31..aa29685bee 100644 --- a/tools/dockerfile/grpc_python/Dockerfile +++ b/tools/dockerfile/grpc_python/Dockerfile @@ -66,5 +66,8 @@ RUN cd /var/local/git/grpc \ # Add a cacerts directory containing the Google root pem file, allowing the interop client to access the production test instance ADD cacerts cacerts +# Add a service_account directory containing the auth creds file +ADD service_account service_account + # Specify the default command such that the interop server runs on its known testing port CMD ["/bin/bash", "-l", "-c", "python2.7 -m interop.server --use_tls --port 8050"] |