diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2016-10-27 10:41:44 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-10-27 10:41:44 -0700 |
| commit | 795976ecf536957719403b72a449e0b250d1b4e1 (patch) | |
| tree | c322c952324e3570371cb46a8619e2ead7dedc7b /jenkins | |
| parent | e9d9e56a6bfa93be5b97d40fd70382807e526d2d (diff) | |
Trigger update of docker for new changes in #2282. (#2288)
Diffstat (limited to 'jenkins')
| -rw-r--r-- | jenkins/docker/Dockerfile | 1 | ||||
| -rw-r--r-- | jenkins/docker32/Dockerfile | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index df3dc8c2..919a2b61 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 015d273c..a36338b4 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 && \ |