Merge pull request #1152 from murgatroid99/docker_php_composer

Update PHP Dockerfiles with composer changes

tools/dockerfile/grpc_php/Dockerfile

@@ -46,4 +46,6 @@ RUN cd /var/local/git/grpc/src/php/ext/grpc \
   && ./configure \
   && make
 
+RUN cd /var/local/git/grpc/src/php && composer install
+
 RUN cd /var/local/git/grpc/src/php && ./bin/run_tests.sh

tools/dockerfile/grpc_php_base/Dockerfile

@@ -32,6 +32,10 @@
 # Includes PHP installation dependencies, things that are unlikely to vary.
 FROM grpc/base
 
+RUN echo "deb http://packages.dotdeb.org wheezy-php55 all" >> /etc/apt/sources.list.d/dotdeb.list
+RUN echo "deb-src http://packages.dotdeb.org wheezy-php55 all" >> /etc/apt/sources.list.d/dotdeb.list
+RUN wget http://www.dotdeb.org/dotdeb.gpg -O- |apt-key add -
+
 # Install RVM dependencies and other packages
 RUN apt-get update && apt-get install -y \
     autoconf \
@@ -64,9 +68,12 @@ RUN apt-get update && apt-get install -y \
     sqlite3 \
     zlib1g-dev
 
-# Install the version of PHP gRPC is tested against
 ENV DEBIAN_FRONTEND noniteractive
 
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | php
+RUN mv composer.phar /usr/local/bin/composer
+
 # 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