diff options
author | Craig Tiller <craig.tiller@gmail.com> | 2015-02-03 21:20:45 -0800 |
---|---|---|
committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-03 21:20:45 -0800 |
commit | d27cf3b3877af4d85f7b57abcb3c9eae01c0aa69 (patch) | |
tree | 0f4524488a93685cce0a42bc36872dec4988c253 /tools/dockerfile/grpc_php_base/Dockerfile | |
parent | d6124991d7daa957625fa92df3e720449fa3d36d (diff) | |
parent | 78d1fd07d27a2ac28eca792933e052cb1fe1fa17 (diff) |
Merge github.com:google/grpc into async-api-new
Conflicts:
Makefile
Diffstat (limited to 'tools/dockerfile/grpc_php_base/Dockerfile')
-rw-r--r-- | tools/dockerfile/grpc_php_base/Dockerfile | 6 |
1 files changed, 1 insertions, 5 deletions
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. |