aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile
diff options
context:
space:
mode:
authorGravatar murgatroid99 <michael.lumish@gmail.com>2015-02-02 14:10:42 -0800
committerGravatar murgatroid99 <michael.lumish@gmail.com>2015-02-02 14:10:42 -0800
commit975a07b9494f3ea48ab0474f8554947018ca32f3 (patch)
tree8928490cbe969f5d76528f4472d4b7fe51d24e35 /tools/dockerfile
parent1fb40badf1d72d286456b6196de20e7bf8646987 (diff)
Switched Protobuf-PHP references to my fork, removed references to git-on-borg
Diffstat (limited to 'tools/dockerfile')
-rw-r--r--tools/dockerfile/grpc_base/README.md3
-rw-r--r--tools/dockerfile/grpc_java/README.md2
-rw-r--r--tools/dockerfile/grpc_php/README.md2
-rw-r--r--tools/dockerfile/grpc_php_base/Dockerfile6
-rw-r--r--tools/dockerfile/grpc_ruby/README.md2
5 files changed, 5 insertions, 10 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