diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2015-02-23 11:50:15 -0800 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2015-02-23 11:50:15 -0800 |
| commit | 7aef9e60f373c899604363e617baaed5b37a154f (patch) | |
| tree | 5ae9cd2379ba0542656208de89a61fbeaee10a49 /tools | |
| parent | 7c15ee88a2cde0fbb7d88a0a31ae772c6895efe9 (diff) | |
| parent | b5795aa24d1605b04c9f61b87adf6f7b26af23e1 (diff) | |
Merge pull request #696 from donnadionne/docker_python
Fixing docker file and image building for python.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dockerfile/grpc_python_base/Dockerfile | 2 | ||||
| -rwxr-xr-x | tools/gce_setup/shared_startup_funcs.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/dockerfile/grpc_python_base/Dockerfile b/tools/dockerfile/grpc_python_base/Dockerfile index 98f695a819..df5db07821 100644 --- a/tools/dockerfile/grpc_python_base/Dockerfile +++ b/tools/dockerfile/grpc_python_base/Dockerfile @@ -17,4 +17,4 @@ RUN apt-get update && apt-get install -y \ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0-alpha-1 # Get the GRPC source from GitHub -RUN git clone --recursive git@github.com:google/grpc.git /var/local/git/grpc +RUN git clone --recursive git@github.com:grpc/grpc.git /var/local/git/grpc diff --git a/tools/gce_setup/shared_startup_funcs.sh b/tools/gce_setup/shared_startup_funcs.sh index 143e039c93..242c792101 100755 --- a/tools/gce_setup/shared_startup_funcs.sh +++ b/tools/gce_setup/shared_startup_funcs.sh @@ -424,6 +424,10 @@ grpc_dockerfile_install() { grpc_docker_sync_roots_pem $dockerfile_dir/cacerts || return 1; grpc_docker_sync_service_account $dockerfile_dir/service_account || return 1; } + [[ $image_label == "grpc/python" ]] && { + grpc_docker_sync_roots_pem $dockerfile_dir/cacerts || return 1; + grpc_docker_sync_service_account $dockerfile_dir/service_account || return 1; + } # TODO(temiola): maybe make cache/no-cache a func option? |