Skip to content

Commit 3d2dfcb

Browse files
committed
Merge pull request grpc#1152 from murgatroid99/docker_php_composer
Update PHP Dockerfiles with composer changes
2 parents 99c2997 + 3781a63 commit 3d2dfcb

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

tools/dockerfile/grpc_php/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,6 @@ RUN cd /var/local/git/grpc/src/php/ext/grpc \
4646
&& ./configure \
4747
&& make
4848

49+
RUN cd /var/local/git/grpc/src/php && composer install
50+
4951
RUN cd /var/local/git/grpc/src/php && ./bin/run_tests.sh

tools/dockerfile/grpc_php_base/Dockerfile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
# Includes PHP installation dependencies, things that are unlikely to vary.
3333
FROM grpc/base
3434

35+
RUN echo "deb http://packages.dotdeb.org wheezy-php55 all" >> /etc/apt/sources.list.d/dotdeb.list
36+
RUN echo "deb-src http://packages.dotdeb.org wheezy-php55 all" >> /etc/apt/sources.list.d/dotdeb.list
37+
RUN wget http://www.dotdeb.org/dotdeb.gpg -O- |apt-key add -
38+
3539
# Install RVM dependencies and other packages
3640
RUN apt-get update && apt-get install -y \
3741
autoconf \
@@ -64,9 +68,12 @@ RUN apt-get update && apt-get install -y \
6468
sqlite3 \
6569
zlib1g-dev
6670

67-
# Install the version of PHP gRPC is tested against
6871
ENV DEBIAN_FRONTEND noniteractive
6972

73+
# Install composer
74+
RUN curl -sS https://getcomposer.org/installer | php
75+
RUN mv composer.phar /usr/local/bin/composer
76+
7077
# Download the patched PHP protobuf so that PHP gRPC clients can be generated
7178
# from proto3 schemas.
7279
RUN git clone https://github.com/murgatroid99/Protobuf-PHP.git /var/local/git/protobuf-php

0 commit comments

Comments
 (0)