diff options
| author |  Mark D. Roth <roth@google.com> | 2016-07-26 11:17:32 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-07-26 11:17:32 -0700 |
| commit | 1212d3f453eda0bf04178b9f9f78440ab5cff42d (patch) | |
| tree | 457cecded1dfb964bbc8253f4743624928b1c300 /tools/dockerfile/stress_test | |
| parent | 889e02e29da6ec5e663cf1e8009a7dc4996df3fe (diff) | |
| parent | b8ec23586dca270754bc035300204e2a202a5ae0 (diff) | |
Merge remote-tracking branch 'upstream/master' into http_connect
Diffstat (limited to 'tools/dockerfile/stress_test')
| -rw-r--r-- | tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile b/tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile index bbbdd4a151..0716be5a9d 100644 --- a/tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile +++ b/tools/dockerfile/stress_test/grpc_interop_stress_php/Dockerfile @@ -103,12 +103,6 @@ RUN pip install --upgrade google-api-python-client # Install dependencies -RUN /bin/bash -l -c "echo 'deb http://packages.dotdeb.org wheezy-php55 all' \ - >> /etc/apt/sources.list.d/dotdeb.list" -RUN /bin/bash -l -c "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 - - RUN apt-get update && apt-get install -y \ git php5 php5-dev phpunit unzip @@ -133,11 +127,6 @@ RUN /bin/bash -l -c "rvm all do gem install ronn rake" RUN curl -sS https://getcomposer.org/installer | php RUN mv composer.phar /usr/local/bin/composer -# As an attempt to work around #4212, try to prefetch Protobuf-PHP dependency -# into composer cache to prevent "composer install" from cloning on each build. -RUN git clone --mirror https://github.com/stanley-cheung/Protobuf-PHP.git \ - /root/.composer/cache/vcs/git-github.com-stanley-cheung-Protobuf-PHP.git/ - # 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 |