diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2017-03-21 10:18:49 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-21 10:18:49 -0700 |
| commit | 1387a6795c743fa41a21e8e1501953cb018be760 (patch) | |
| tree | a08e1b80aaf61c15c41cd4a66b884d7a8922e2da /jenkins | |
| parent | ffa932bf10d958fc3dff3ac9153f1b4ef55d6024 (diff) | |
Update commit number in Docker to update composer dependency (#2869)
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 b7583fc7..659336d8 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -129,7 +129,7 @@ ENV MVN mvn --batch-mode RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ - git reset bf379715c93b581eeb078cec1f0dd8a7d79df431 && \ + git reset 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ ./autogen.sh && \ ./configure && \ make -j4 && \ diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index 94d9a4c3..02e9df17 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 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ + git reset 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ 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 && \ |