From 795976ecf536957719403b72a449e0b250d1b4e1 Mon Sep 17 00:00:00 2001 From: Paul Yang Date: Thu, 27 Oct 2016 10:41:44 -0700 Subject: [PATCH] Trigger update of docker for new changes in #2282. (#2288) --- jenkins/docker/Dockerfile | 1 + jenkins/docker32/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index df3dc8c298..919a2b612e 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -132,6 +132,7 @@ ENV MVN mvn --batch-mode RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ + git reset 734930f9197b7bc97c3c794c7a949fee2a08c280 && \ ./autogen.sh && \ ./configure && \ make -j4 && \ diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index 015d273cbe..a36338b4c5 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -64,6 +64,7 @@ RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ + git reset 734930f9197b7bc97c3c794c7a949fee2a08c280 && \ 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 && \