From 80df992f98238dafb279b91fa9936e9207bb0d03 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Fri, 27 Mar 2015 14:31:49 -0700 Subject: [PATCH] Added composer commands to PHP Dockerfiles --- tools/dockerfile/grpc_php/Dockerfile | 2 ++ tools/dockerfile/grpc_php_base/Dockerfile | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/dockerfile/grpc_php/Dockerfile b/tools/dockerfile/grpc_php/Dockerfile index e84455fc94d..0b4819841d5 100644 --- a/tools/dockerfile/grpc_php/Dockerfile +++ b/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 \ No newline at end of file diff --git a/tools/dockerfile/grpc_php_base/Dockerfile b/tools/dockerfile/grpc_php_base/Dockerfile index c58cccba742..3ed9b490893 100644 --- a/tools/dockerfile/grpc_php_base/Dockerfile +++ b/tools/dockerfile/grpc_php_base/Dockerfile @@ -64,9 +64,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