diff options
| author |  Matt Kwong <mattkwong@google.com> | 2016-10-04 17:34:35 -0700 |
|---|---|---|
| committer | Matt Kwong <mattkwong@google.com> | 2016-10-04 17:34:35 -0700 |
| commit | 8bed8c853fbfe9f10d379b1bd731c2835d50a2c9 (patch) | |
| tree | e97c1fb2eef6e1ab8a72b02f3e4f9b32901b37c7 /tools/dockerfile/stress_test/grpc_interop_stress_php | |
| parent | 66a1eea681b1337340e33abd211a8fb1233e8eab (diff) | |
| parent | 49480d4cf2c8c95825a6bd37172e96bebb39dc69 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix_docker_local_clone
Diffstat (limited to 'tools/dockerfile/stress_test/grpc_interop_stress_php')
| -rw-r--r-- | tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile | 15 | ||||
| -rwxr-xr-x | tools/dockerfile/stress_test/grpc_interop_stress_php/build_interop_stress.sh | 3 |
2 files changed, 1 insertions, 17 deletions
diff --git a/tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile b/tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile index 0716be5a9d..0fe9c151e5 100644 --- a/tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile +++ b/tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile @@ -117,24 +117,9 @@ RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ RUN mkdir /var/local/jenkins -# 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"] diff --git a/tools/dockerfile/stress_test/grpc_interop_stress_php/build_interop_stress.sh b/tools/dockerfile/stress_test/grpc_interop_stress_php/build_interop_stress.sh index c6d03ea28e..fc71095610 100755 --- a/tools/dockerfile/stress_test/grpc_interop_stress_php/build_interop_stress.sh +++ b/tools/dockerfile/stress_test/grpc_interop_stress_php/build_interop_stress.sh @@ -42,7 +42,6 @@ ${name}') cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc -rvm --default use ruby-2.1 make install-certs @@ -55,4 +54,4 @@ make install (cd src/php && composer install) -(cd src/php && protoc-gen-php -i tests/interop/ -o tests/interop/ tests/interop/test.proto) +(cd src/php && ./bin/generate_proto_php.sh) |