aboutsummaryrefslogtreecommitdiffhomepage
path: root/jenkins/docker
diff options
context:
space:
mode:
authorGravatar Bo Yang <teboring@google.com>2017-07-17 09:36:22 -0700
committerGravatar Bo Yang <teboring@google.com>2017-07-18 11:06:16 -0700
commit6ec0b7e4d1fb606c6572a946e4eae97273367e67 (patch)
treed983812539a3299ff130fff469140bdcd1bb1690 /jenkins/docker
parent324b20a49170cb38d15ef243bc044026adb54ae1 (diff)
parent5532abc15b97f3489183b266b41844306052a3fa (diff)
Merge 3.3.x into master
Diffstat (limited to 'jenkins/docker')
-rw-r--r--jenkins/docker/Dockerfile17
1 files changed, 15 insertions, 2 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile
index fcebe167..45900262 100644
--- a/jenkins/docker/Dockerfile
+++ b/jenkins/docker/Dockerfile
@@ -129,7 +129,7 @@ ENV MVN mvn --batch-mode
RUN cd /tmp && \
git clone https://github.com/google/protobuf.git && \
cd protobuf && \
- git reset --hard c2b3b3e04e7a023efe06f2107705b45428847800 && \
+ git reset --hard 129a6e2aca95dcfb6c3e717d7b9cca1f104fde39 && \
./autogen.sh && \
./configure && \
make -j4 && \
@@ -164,6 +164,14 @@ RUN cd php-7.0.18 && ./configure --enable-maintainer-zts --prefix=/usr/local/php
RUN cd php-7.0.18 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-7.0 && \
make && make install && cd ..
+RUN wget http://am1.php.net/get/php-7.1.4.tar.bz2/from/this/mirror
+RUN mv mirror php-7.1.4.tar.bz2
+RUN tar -xvf php-7.1.4.tar.bz2
+RUN cd php-7.1.4 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-7.1-zts && \
+ make && make install && cd ..
+RUN cd php-7.1.4 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-7.1 && \
+ 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
@@ -190,7 +198,12 @@ RUN cd /tmp && \
ln -sfn /usr/local/php-7.0/bin/php-config /usr/bin/php-config && \
ln -sfn /usr/local/php-7.0/bin/phpize /usr/bin/phpize && \
composer install && \
- mv vendor /usr/local/vendor-7.0
+ mv vendor /usr/local/vendor-7.0 && \
+ ln -sfn /usr/local/php-7.1/bin/php /usr/bin/php && \
+ ln -sfn /usr/local/php-7.1/bin/php-config /usr/bin/php-config && \
+ ln -sfn /usr/local/php-7.1/bin/phpize /usr/bin/phpize && \
+ composer install && \
+ mv vendor /usr/local/vendor-7.1
##################
# Go dependencies.