diff options
| author |  Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-03-27 13:12:51 -0700 |
|---|---|---|
| committer | Tim Emiola <tbetbetbe@users.noreply.github.com> | 2015-03-27 13:12:51 -0700 |
| commit | ce0268cab813190801bf1e0eb317cde105b4559d (patch) | |
| tree | bef5718b906df66b22224a6cabc68ffe9ec0eae7 | |
| parent | fa507530590944683a0c672fcd4ea5a54977c903 (diff) | |
| parent | d081a22368dc2981017cd4550d4fe411965b144c (diff) | |
Merge pull request #1145 from murgatroid99/docker_install_php
Docker install php
| -rw-r--r-- | tools/dockerfile/grpc_php/Dockerfile | 2 | ||||
| -rw-r--r-- | tools/dockerfile/grpc_php_base/Dockerfile | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/tools/dockerfile/grpc_php/Dockerfile b/tools/dockerfile/grpc_php/Dockerfile index 100d7b3bdb..e84455fc94 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 cc874fd7c5..c58cccba74 100644 --- a/tools/dockerfile/grpc_php_base/Dockerfile +++ b/tools/dockerfile/grpc_php_base/Dockerfile @@ -50,15 +50,15 @@ 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 \ sqlite3 \ @@ -66,13 +66,6 @@ RUN apt-get update && apt-get install -y \ # 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. |