diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2016-12-08 11:16:49 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-12-08 11:16:49 -0800 |
| commit | 46ae90dc5e145b12fffa7e053a908a9f3e066286 (patch) | |
| tree | e15e50f9a986bd64cd4413b135382a305701437f /jenkins | |
| parent | 631f4618a7b84cdc91949229a11a8abe5dfc4a34 (diff) | |
Make php generated code conform to PSR-4. (#2435)
1. Generate single file for each message.
2. Lazily initiate metadata.
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | jenkins/docker32/Dockerfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index 3f4725b2..ca56a7c0 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -148,7 +148,7 @@ RUN php composer-setup.php RUN mv composer.phar /usr/bin/composer RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ - cd protobuf && \ + cd protobuf/php && \ ln -sfn /usr/bin/php5.5 /usr/bin/php && \ ln -sfn /usr/bin/php-config5.5 /usr/bin/php-config && \ ln -sfn /usr/bin/phpize5.5 /usr/bin/phpize && \ diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index a36338b4..bf59503f 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -63,7 +63,7 @@ RUN mv composer.phar /usr/bin/composer RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ - cd protobuf && \ + cd protobuf/php && \ git reset 734930f9197b7bc97c3c794c7a949fee2a08c280 && \ ln -sfn /usr/bin/php5.5 /usr/bin/php && \ ln -sfn /usr/bin/php-config5.5 /usr/bin/php-config && \ |