From b5795aa24d1605b04c9f61b87adf6f7b26af23e1 Mon Sep 17 00:00:00 2001 From: Donna Dionne Date: Fri, 20 Feb 2015 19:34:19 -0800 Subject: [PATCH] Fixing docker file and image building for python. --- tools/dockerfile/grpc_python_base/Dockerfile | 2 +- tools/gce_setup/shared_startup_funcs.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/dockerfile/grpc_python_base/Dockerfile b/tools/dockerfile/grpc_python_base/Dockerfile index 98f695a8191..df5db07821f 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 143e039c93d..242c7921013 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?