diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2016-12-08 14:39:20 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-12-08 14:39:20 -0800 |
| commit | e3e38b81cc2eb3b31896342a2511cdc390bed280 (patch) | |
| tree | 9f7ac7325cf5763494c3e89eba2f3c129b11f558 /jenkins | |
| parent | 4474c042c07fe208ab8bf0bd177c65dfd19d8a17 (diff) | |
Update commit id in Dockerfile to trigger update. (#2467)
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | jenkins/docker32/Dockerfile | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index ca56a7c0..c5ee1ec0 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -148,7 +148,11 @@ RUN php composer-setup.php RUN mv composer.phar /usr/bin/composer RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ - cd protobuf/php && \ + rm -rf protobuf && \ + git clone https://github.com/google/protobuf.git && \ + cd protobuf && \ + git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ + cd 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 bf59503f..94d9a4c3 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -64,7 +64,7 @@ RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf/php && \ - git reset 734930f9197b7bc97c3c794c7a949fee2a08c280 && \ + git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ 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 && \ |