diff options
| author | Bo Yang <paulyang1211@gmail.com> | 2017-08-05 10:42:29 -0700 |
|---|---|---|
| committer | Bo Yang <paulyang1211@gmail.com> | 2017-08-05 10:42:29 -0700 |
| commit | 8f4b8e430a0cf087af423be434cf8d837027c651 (patch) | |
| tree | a7a79a2ff33b31b9036eb378eb458928a0648481 /jenkins/docker32/Dockerfile | |
| parent | c2f69d6fa23a815948368fae0b8c1e56e50715c9 (diff) | |
| parent | f14703c933d04a4aac285c482bf828269bd0a151 (diff) | |
| download | protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.tar.gz protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.tar.bz2 protobuf-8f4b8e430a0cf087af423be434cf8d837027c651.zip | |
Merge branch 'master' into 3.4.x
Diffstat (limited to 'jenkins/docker32/Dockerfile')
| -rw-r--r-- | jenkins/docker32/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index 2c9d4165..1278889f 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -98,7 +98,7 @@ RUN composer config -g -- secure-http false RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf/php && \ - git reset --hard 8d97b3d8b5a33650e822460b3b561802c969e86e && \ + git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \ ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \ ln -sfn /usr/local/php-5.5/bin/php-config /usr/bin/php-config && \ ln -sfn /usr/local/php-5.5/bin/phpize /usr/bin/phpize && \ |