Switched Protobuf-PHP references to my fork, removed references to git-on-borg

9 files changed, 7 insertions, 49 deletions

diff --git a/tools/dockerfile/grpc_base/README.md b/tools/dockerfile/grpc_base/README.md
index 4745141fc4..e3b5f2ef37 100644
--- a/tools/dockerfile/grpc_base/README.md
+++ b/tools/dockerfile/grpc_base/README.md
@@ -4,8 +4,7 @@ Base GRPC Dockerfile
 Dockerfile for creating the base gRPC development Docker instance.
 For now, this assumes that the development will be done on GCE instances, with source code on Git-on-Borg.
 
-As of 2014/09/29, it includes
+As of 2015/02/02, it includes
 - git
 - some useful tools like curl, emacs, strace, telnet etc
-- downloads the gerrit-compute-tools and installs the script that allows access to gerrit when on git-on-borg
 - a patched version of protoc, to allow protos with stream tags to work
diff --git a/tools/dockerfile/grpc_java/README.md b/tools/dockerfile/grpc_java/README.md
index 2da2393bef..808f0fc5f3 100644
--- a/tools/dockerfile/grpc_java/README.md
+++ b/tools/dockerfile/grpc_java/README.md
@@ -5,5 +5,5 @@ Dockerfile for creating the Java development image
 
 As of 2014/12 this
  - is based on the gRPC Java base
- - pulls from gRPC Java on git-on-borg
+ - pulls from gRPC Java on GitHub
  - installs it and runs the tests
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_php/README.md b/tools/dockerfile/grpc_php/README.md
index a37389ff60..f3c332b8b3 100644
--- a/tools/dockerfile/grpc_php/README.md
+++ b/tools/dockerfile/grpc_php/README.md
@@ -5,6 +5,6 @@ Dockerfile for creating the PHP development instances
 
 As of 2014/10 this
 - is based on the GRPC PHP base
-- adds a pull of the HEAD GRPC PHP source from git-on-borg
+- adds a pull of the HEAD GRPC PHP source from GitHub
 - it builds it
 - runs the tests, i.e, the image won't be created if the tests don't pass
diff --git a/tools/dockerfile/grpc_php_base/Dockerfile b/tools/dockerfile/grpc_php_base/Dockerfile
index 47266a310e..ef58f3a887 100644
--- a/tools/dockerfile/grpc_php_base/Dockerfile
+++ b/tools/dockerfile/grpc_php_base/Dockerfile
@@ -45,13 +45,9 @@ RUN cd /var/local \
   && ./configure --with-zlib=/usr --with-libxml-dir=ext/libxml \
   && make -j12 && make install
 
-# Start the daemon that allows access to the protected git-on-borg repos
-RUN git clone https://gerrit.googlesource.com/gcompute-tools /var/local/git/gcompute-tools
-RUN /var/local/git/gcompute-tools/git-cookie-authdaemon
-
 # Download the patched PHP protobuf so that PHP gRPC clients can be generated
 # from proto3 schemas.
-RUN git clone https://team.googlesource.com/one-platform-grpc-team/grpc-php-protobuf-php /var/local/git/protobuf-php
+RUN git clone git@github.com:murgatroid99/Protobuf-PHP.git /var/local/git/protobuf-php
 
 # Install ruby (via RVM) as ruby tools are dependencies for building Protobuf
 # PHP extensions.
diff --git a/tools/dockerfile/grpc_ruby/README.md b/tools/dockerfile/grpc_ruby/README.md
index 51fb2f5970..eaa8382f1c 100644
--- a/tools/dockerfile/grpc_ruby/README.md
+++ b/tools/dockerfile/grpc_ruby/README.md
@@ -5,6 +5,6 @@ Dockerfile for creating the Ruby development instances
 
 As of 2014/10 this
 - is based on the GRPC Ruby base
-- adds a pull of the HEAD gRPC Ruby source from git-on-borg
+- adds a pull of the HEAD gRPC Ruby source from GitHub
 - it builds it
 - runs the tests, i.e, the image won't be created if the tests don't pass
diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh
index a97cc88aee..bb451141fc 100755
--- a/tools/gce_setup/grpc_docker.sh
+++ b/tools/gce_setup/grpc_docker.sh
@@ -895,7 +895,7 @@ grpc_cloud_prod_gen_java_cmd() {
 
 # constructs the full dockerized php interop test cmd.
 #
-# TODO(mlumish): update this to use the script once that's on git-on-borg
+# TODO(mlumish): update this to use the script once that's on git
 #
 # call-seq:
 #   flags= .... # generic flags to include the command
diff --git a/tools/gce_setup/new_grpc_docker_builder.sh b/tools/gce_setup/new_grpc_docker_builder.sh
index 5d4fc361ad..ea36cc5606 100755
--- a/tools/gce_setup/new_grpc_docker_builder.sh
+++ b/tools/gce_setup/new_grpc_docker_builder.sh
@@ -86,7 +86,6 @@ add_instance() {
   [[ -n $the_address ]] && address_flag="--address $the_address"
   local the_image='container-vm-v20140925'
   local scopes='compute-rw storage-full'
-  scopes+=' https://www.googleapis.com/auth/gerritcodereview'
   scopes+=' https://www.googleapis.com/auth/xapi.zoo'
   gcloud --project $project compute instances create $instance \
     $address_flag \
diff --git a/tools/gce_setup/new_grpc_docker_builder_on_startup.sh b/tools/gce_setup/new_grpc_docker_builder_on_startup.sh
index 87e8aac1e7..4b20a8be7d 100755
--- a/tools/gce_setup/new_grpc_docker_builder_on_startup.sh
+++ b/tools/gce_setup/new_grpc_docker_builder_on_startup.sh
@@ -3,8 +3,7 @@
 #
 # A grpc-docker GCE machine is based on docker container image.
 #
-# On startup, it copies the grpc dockerfiles to a local directory, and update its address
-# so that the docker containers within it have git-on-borg-access.
+# On startup, it copies the grpc dockerfiles to a local directory, and update its address.
 
 # _load_metadata curls a metadata url
 _load_metadata() {
@@ -54,10 +53,6 @@ main() {
     # Install git and emacs
     apt-get update && apt-get install -y git emacs || return 1
 
-    # Enable access to git repos on git-on-borg
-    local git_root='/var/local/git'
-    install_gob_daemon $git_root/gerrit-gcompute-tools || return 1
-
     # Startup the docker registry
     grpc_docker_launch_registry && grpc_docker_pull_known
 
diff --git a/tools/gce_setup/shared_startup_funcs.sh b/tools/gce_setup/shared_startup_funcs.sh
index 3300eb257d..3410a2a2c8 100755
--- a/tools/gce_setup/shared_startup_funcs.sh
+++ b/tools/gce_setup/shared_startup_funcs.sh
@@ -251,37 +251,6 @@ update_address_to() {
   }
 }
 
-# Allows instances to checkout repos on git-on-borg.
-#
-install_gob_daemon() {
-  local gob_dir=$1
-  [[ -n $gob_dir ]] || { echo "missing args: gob_dir" >&2; return 1;  }
-
-  local gob_repo=$2
-  [[ -n $gob_repo ]] || gob_repo='https://gerrit.googlesource.com/gcompute-tools/'
-
-  if [[ -e $gob_dir ]]
-  then
-    rm -fv $gob_dir || {
-      echo "could not remove existing git repo at $gob_dir" >&2
-      return 1
-    }
-  fi
-
-  git clone $gob_repo $gob_dir || { echo "failed to pull gerrit cookie repo" >&2; return 1; }
-  local startup_script=/etc/profile.d/gob_cookie_daemon.sh
-
-  cat <<EOF >> $startup_script
-#!/bin/bash
-
-$gob_dir/git-cookie-authdaemon
-
-EOF
-
-  chmod 755 $startup_script
-  $startup_script
-}
-
 # grpc_docker_add_docker_group
 #
 # Adds a docker group, restarts docker, relaunches the docker registry