aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Paul Yang <TeBoring@users.noreply.github.com>2017-08-04 16:42:19 -0700
committerGravatar GitHub <noreply@github.com>2017-08-04 16:42:19 -0700
commitf14703c933d04a4aac285c482bf828269bd0a151 (patch)
treeac7bbaf4138f8aeb38a9e15674160f227e4841fa
parent49b44bff2b6257a119f9c6a342d6151c736586b8 (diff)
Update commit id in Dockerfile to reflect change in #3391 (#3459)
-rw-r--r--jenkins/docker/Dockerfile2
-rw-r--r--jenkins/docker32/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile
index 45900262..8faba4c6 100644
--- a/jenkins/docker/Dockerfile
+++ b/jenkins/docker/Dockerfile
@@ -182,7 +182,7 @@ RUN cd /tmp && \
rm -rf protobuf && \
git clone https://github.com/google/protobuf.git && \
cd protobuf && \
- git reset --hard 8d97b3d8b5a33650e822460b3b561802c969e86e && \
+ git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \
cd php && \
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 && \
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 && \