Index: third_party/protobuf/jenkins/docker/Dockerfile |
diff --git a/third_party/protobuf/jenkins/docker/Dockerfile b/third_party/protobuf/jenkins/docker/Dockerfile |
index 8467aeff51f64c0814b877c0685308d99619db7b..c5ee1ec07977b069dbf02d98db60aae9a2b75ae4 100644 |
--- a/third_party/protobuf/jenkins/docker/Dockerfile |
+++ b/third_party/protobuf/jenkins/docker/Dockerfile |
@@ -14,18 +14,29 @@ RUN echo 'deb http://ppa.launchpad.net/fkrull/deadsnakes/ubuntu trusty main' > / |
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DB82666C |
# Apt source for Oracle Java. |
-run echo 'deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main' > /etc/apt/sources.list.d/webupd8team-java-trusty.list && \ |
+RUN echo 'deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main' > /etc/apt/sources.list.d/webupd8team-java-trusty.list && \ |
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EEA14886 && \ |
echo "oracle-java7-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections |
# Apt source for Mono |
-run echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list && \ |
+RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list && \ |
echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list && \ |
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF |
+# Apt source for php |
+RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu trusty main" | tee /etc/apt/sources.list.d/various-php.list && \ |
+ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F4FCBB07 |
+ |
+# Install dotnet SDK based on https://www.microsoft.com/net/core#debian |
+# (Ubuntu instructions need apt to support https) |
+RUN apt-get update && apt-get install -y --force-yes curl libunwind8 gettext && \ |
+ curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=809130 && \ |
+ mkdir -p /opt/dotnet && tar zxf dotnet.tar.gz -C /opt/dotnet && \ |
+ ln -s /opt/dotnet/dotnet /usr/local/bin |
+ |
# Install dependencies. We start with the basic ones require to build protoc |
# and the C++ build |
-RUN apt-get update && apt-get install -y \ |
+RUN apt-get clean && apt-get update && apt-get install -y --force-yes \ |
autoconf \ |
autotools-dev \ |
build-essential \ |
@@ -64,6 +75,21 @@ RUN apt-get update && apt-get install -y \ |
python3.4-dev \ |
# -- For Ruby -- |
ruby \ |
+ # -- For C++ benchmarks -- |
+ cmake \ |
+ # -- For PHP -- |
+ php5.5 \ |
+ php5.5-dev \ |
+ php5.5-xml \ |
+ php5.6 \ |
+ php5.6-dev \ |
+ php5.6-xml \ |
+ php7.0 \ |
+ php7.0-dev \ |
+ php7.0-xml \ |
+ phpunit \ |
+ valgrind \ |
+ libxml2-dev \ |
&& apt-get clean |
################## |
@@ -80,7 +106,6 @@ RUN wget www.nuget.org/NuGet.exe -O /usr/local/bin/nuget.exe |
RUN pip install pip --upgrade |
RUN pip install virtualenv tox yattag |
- |
################## |
# Ruby dependencies |
@@ -88,12 +113,12 @@ RUN pip install virtualenv tox yattag |
RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 |
RUN \curl -sSL https://get.rvm.io | bash -s stable |
-# Install Ruby 2.1 |
+# Install Ruby 2.1, Ruby 2.2 and JRuby 1.7 |
RUN /bin/bash -l -c "rvm install ruby-2.1" |
-RUN /bin/bash -l -c "rvm use --default ruby-2.1" |
+RUN /bin/bash -l -c "rvm install ruby-2.2" |
+RUN /bin/bash -l -c "rvm install jruby-1.7" |
RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" |
RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" |
-RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc" |
RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" |
################## |
@@ -107,16 +132,67 @@ ENV MVN mvn --batch-mode |
RUN cd /tmp && \ |
git clone https://github.com/google/protobuf.git && \ |
cd protobuf && \ |
+ git reset bf379715c93b581eeb078cec1f0dd8a7d79df431 && \ |
./autogen.sh && \ |
./configure && \ |
- make -j6 && \ |
+ make -j4 && \ |
cd java && \ |
- $MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO -P lite && \ |
$MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO && \ |
cd ../javanano && \ |
$MVN install dependency:go-offline -Dmaven.repo.local=$MAVEN_REPO |
################## |
+# PHP dependencies. |
+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 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 && \ |
+ composer install && \ |
+ mv vendor /usr/local/vendor-5.5 && \ |
+ ln -sfn /usr/bin/php5.6 /usr/bin/php && \ |
+ ln -sfn /usr/bin/php-config5.6 /usr/bin/php-config && \ |
+ ln -sfn /usr/bin/phpize5.6 /usr/bin/phpize && \ |
+ composer install && \ |
+ mv vendor /usr/local/vendor-5.6 && \ |
+ ln -sfn /usr/bin/php7.0 /usr/bin/php && \ |
+ ln -sfn /usr/bin/php-config7.0 /usr/bin/php-config && \ |
+ 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. |
+RUN apt-get install -y \ |
+ # -- For go -- \ |
+ golang |
+ |
+################## |
+# Javascript dependencies. |
+RUN apt-get install -y \ |
+ # -- For javascript -- \ |
+ npm |
+ |
+# On Debian/Ubuntu, nodejs binary is named 'nodejs' because the name 'node' |
+# is taken by another legacy binary. We don't have that legacy binary and |
+# npm expects the binary to be named 'node', so we just create a symbol |
+# link here. |
+RUN ln -s `which nodejs` /usr/bin/node |
+ |
+################## |
# Prepare ccache |
RUN ln -s /usr/bin/ccache /usr/local/bin/gcc |