Merge pull request #696 from donnadionne/docker_python

Fixing docker file and image building for python.

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

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?