From 92e86f946fcda636edf27e1c88e0517f4d6b7643 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Fri, 27 Mar 2015 12:02:34 -0700
Subject: [PATCH 1/2] Updated php_base Dockerfile to install PHP instead of
 compiling it

---
 tools/dockerfile/grpc_php/Dockerfile      |  2 ++
 tools/dockerfile/grpc_php_base/Dockerfile | 26 ++++++-----------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/tools/dockerfile/grpc_php/Dockerfile b/tools/dockerfile/grpc_php/Dockerfile
index 100d7b3bdb3..e84455fc94d 100644
--- a/tools/dockerfile/grpc_php/Dockerfile
+++ b/tools/dockerfile/grpc_php/Dockerfile
@@ -45,3 +45,5 @@ RUN cd /var/local/git/grpc/src/php/ext/grpc && git pull && phpize
 RUN cd /var/local/git/grpc/src/php/ext/grpc \
   && ./configure \
   && make
+
+RUN cd /var/local/git/grpc/src/php && ./bin/run_tests.sh
\ No newline at end of file
diff --git a/tools/dockerfile/grpc_php_base/Dockerfile b/tools/dockerfile/grpc_php_base/Dockerfile
index cc874fd7c55..2fa0e0636b9 100644
--- a/tools/dockerfile/grpc_php_base/Dockerfile
+++ b/tools/dockerfile/grpc_php_base/Dockerfile
@@ -50,45 +50,33 @@ RUN apt-get update && apt-get install -y \
     libsqlite3-dev \
     libssl-dev \
     libtool \
+    libxml2 \
     libyaml-dev \
     make \
     patch \
     procps \
-# TODO(mlumish): Uncomment these lines when building against them works
-#    php5-common \
-#    php5-cli \
-#    php5-dev \
-#    php-pear \
+    php5-common \
+    php5-cli \
+    php5-dev \
+    php-pear \
     pkg-config \
     procps \
+    ruby-full \
     sqlite3 \
     zlib1g-dev
 
 # Install the version of PHP gRPC is tested against
 ENV DEBIAN_FRONTEND noniteractive
-RUN apt-get update && apt-get install -y libxml2 libxml2-dev  # used by PHP
-RUN cd /var/local \
-  && curl -o php-5.5.17.tar.gz http://php.net/distributions/php-5.5.17.tar.gz \
-  && tar -xf php-5.5.17.tar.gz \
-  && cd php-5.5.17 \
-  && ./configure --with-zlib=/usr --with-libxml-dir=ext/libxml \
-  && make -j12 && make install
 
 # Download the patched PHP protobuf so that PHP gRPC clients can be generated
 # from proto3 schemas.
 RUN git clone https://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.
-RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3  # Needed for RVM
-RUN \curl -sSL https://get.rvm.io | bash -s stable --ruby
-ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
 # ronn: a ruby tool used to convert markdown to man pages, used during the
 # install of Protobuf extensions
 #
 # rake: a ruby version of make used to build the PHP Protobuf extension
-RUN rvm all do gem install ronn rake
+RUN gem install ronn rake
 
 # Get the source from GitHub, this gets the protobuf library as well
 RUN git clone https://github.com/grpc/grpc.git /var/local/git/grpc

From d081a22368dc2981017cd4550d4fe411965b144c Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Fri, 27 Mar 2015 12:36:34 -0700
Subject: [PATCH 2/2] Removed ruby installation change

---
 tools/dockerfile/grpc_php_base/Dockerfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/dockerfile/grpc_php_base/Dockerfile b/tools/dockerfile/grpc_php_base/Dockerfile
index 2fa0e0636b9..c58cccba742 100644
--- a/tools/dockerfile/grpc_php_base/Dockerfile
+++ b/tools/dockerfile/grpc_php_base/Dockerfile
@@ -61,7 +61,6 @@ RUN apt-get update && apt-get install -y \
     php-pear \
     pkg-config \
     procps \
-    ruby-full \
     sqlite3 \
     zlib1g-dev
 
@@ -72,11 +71,17 @@ ENV DEBIAN_FRONTEND noniteractive
 # from proto3 schemas.
 RUN git clone https://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.
+RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3  # Needed for RVM
+RUN \curl -sSL https://get.rvm.io | bash -s stable --ruby
+ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
 # ronn: a ruby tool used to convert markdown to man pages, used during the
 # install of Protobuf extensions
 #
 # rake: a ruby version of make used to build the PHP Protobuf extension
-RUN gem install ronn rake
+RUN rvm all do gem install ronn rake
 
 # Get the source from GitHub, this gets the protobuf library as well
 RUN git clone https://github.com/grpc/grpc.git /var/local/git/grpc