From dd8d5f57d7068080283c2c03af01d806efbe6cf4 Mon Sep 17 00:00:00 2001
From: Paul Yang <TeBoring@users.noreply.github.com>
Date: Wed, 8 Mar 2017 14:31:34 -0800
Subject: Rename encode/decode to serializeToString/mergeFromString (#2795)

This better shows the semantic of the API. For already setted fields,
mergeFromString do replacement for singular fields and appending for
repeated fields.
---
 jenkins/docker/Dockerfile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'jenkins/docker/Dockerfile')

diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile
index c5ee1ec0..b7583fc7 100644
--- a/jenkins/docker/Dockerfile
+++ b/jenkins/docker/Dockerfile
@@ -78,9 +78,6 @@ RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
   # -- For C++ benchmarks --
   cmake \
   # -- For PHP --
-  php5.5     \
-  php5.5-dev \
-  php5.5-xml \
   php5.6     \
   php5.6-dev \
   php5.6-xml \
@@ -143,19 +140,28 @@ RUN cd /tmp && \
 
 ##################
 # PHP dependencies.
+RUN wget http://am1.php.net/get/php-5.5.38.tar.bz2/from/this/mirror
+RUN mv mirror php-5.5.38.tar.bz2
+RUN tar -xvf php-5.5.38.tar.bz2
+RUN cd php-5.5.38 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-5.5-zts && \
+    make && make install && cd ..
+RUN cd php-5.5.38 && make clean && ./configure --prefix=/usr/local/php-5.5 && \
+    make && make install && cd ..
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php composer-setup.php
 RUN mv composer.phar /usr/bin/composer
 RUN php -r "unlink('composer-setup.php');"
+RUN composer config -g -- disable-tls true
+RUN composer config -g -- secure-http false
 RUN cd /tmp && \
   rm -rf protobuf && \
   git clone https://github.com/google/protobuf.git && \
   cd protobuf && \
   git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \
   cd php && \
-  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 && \
+  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 && \
   composer install && \
   mv vendor /usr/local/vendor-5.5 && \
   ln -sfn /usr/bin/php5.6 /usr/bin/php && \
@@ -168,11 +174,6 @@ RUN cd /tmp && \
   ln -sfn /usr/bin/phpize7.0 /usr/bin/phpize && \
   composer install && \
   mv vendor /usr/local/vendor-7.0
-RUN wget http://am1.php.net/get/php-5.5.38.tar.bz2/from/this/mirror
-RUN mv mirror php-5.5.38.tar.bz2
-RUN tar -xvf php-5.5.38.tar.bz2
-RUN cd php-5.5.38 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-5.5-zts && \
-    make && make install
 
 ##################
 # Go dependencies.
-- 
cgit v1.2.3