diff options
| author |  Stanley Cheung <stanleycheung@google.com> | 2016-07-23 19:07:36 -0700 |
|---|---|---|
| committer | Stanley Cheung <stanleycheung@google.com> | 2016-07-23 19:07:36 -0700 |
| commit | 2e2cdffe9dba109c7602ec33b99b123eceb071e2 (patch) | |
| tree | 9559897f5113b25727e4af02f9fd0513c361a8cc /templates/tools/dockerfile/interoptest/grpc_interop_php | |
| parent | 47168ea6ee63a88429256f78cde24da420c24f13 (diff) | |
php: add php7 to jenkins basic and interop tests
Diffstat (limited to 'templates/tools/dockerfile/interoptest/grpc_interop_php')
| -rw-r--r-- | templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template b/templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template index 258d29aa97..f37eadad74 100644 --- a/templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template +++ b/templates/tools/dockerfile/interoptest/grpc_interop_php/Dockerfile.template @@ -1,6 +1,6 @@ %YAML 1.2 --- | - # Copyright 2015, Google Inc. + # Copyright 2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -32,29 +32,8 @@ FROM debian:jessie <%include file="../../apt_get_basic.include"/> - <%include file="../../python_deps.include"/> <%include file="../../ruby_deps.include"/> <%include file="../../php_deps.include"/> <%include file="../../run_tests_addons.include"/> - # 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 /bin/bash -l -c "rvm all do gem install ronn rake" - - # 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/stanley-cheung/Protobuf-PHP.git /var/local/git/protobuf-php - - RUN /bin/bash -l -c "rvm use ruby-2.1 ${'\\'} - && cd /var/local/git/protobuf-php ${'\\'} - && rvm all do rake pear:package version=1.0 ${'\\'} - && pear install Protobuf-1.0.tgz" - - # Define the default command. - CMD ["bash"] + <%include file="../../php_common_deps.include"/> |