From ef8cf30cc4a1a8e415384bc19d41cd919120824c Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Sun, 7 Feb 2016 18:02:17 -0800 Subject: add generated dockerfiles --- tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 87 +++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 tools/dockerfile/test/cxx_jessie_x64/Dockerfile (limited to 'tools/dockerfile/test/cxx_jessie_x64/Dockerfile') diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile new file mode 100644 index 0000000000..d897c8fab0 --- /dev/null +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -0,0 +1,87 @@ +# Copyright 2015-2016, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +FROM debian:jessie + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +#================= +# C++ dependencies +RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean + +# Prepare ccache +RUN ln -s /usr/bin/ccache /usr/local/bin/gcc +RUN ln -s /usr/bin/ccache /usr/local/bin/g++ +RUN ln -s /usr/bin/ccache /usr/local/bin/cc +RUN ln -s /usr/bin/ccache /usr/local/bin/c++ +RUN ln -s /usr/bin/ccache /usr/local/bin/clang +RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ + +#====================== +# Zookeeper dependencies +# TODO(jtattermusch): is zookeeper still needed? +RUN apt-get install -y libzookeeper-mt-dev + +RUN mkdir /var/local/jenkins + +# Define the default command. +CMD ["bash"] + -- cgit v1.2.3 From 1978e26119257178b4274d5112194a97e3f2b90d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 8 Feb 2016 11:45:13 -0800 Subject: regenerated dockerfiles --- tools/dockerfile/test/csharp_jessie_x64/Dockerfile | 16 ++++++---------- tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 6 +++--- tools/dockerfile/test/cxx_jessie_x86/Dockerfile | 6 +++--- tools/dockerfile/test/node_jessie_x64/Dockerfile | 6 +++--- tools/dockerfile/test/php_jessie_x64/Dockerfile | 6 +++--- tools/dockerfile/test/python_jessie_x64/Dockerfile | 6 +++--- tools/dockerfile/test/ruby_jessie_x64/Dockerfile | 6 +++--- tools/dockerfile/test/sanity/Dockerfile | 6 +++--- 8 files changed, 27 insertions(+), 31 deletions(-) (limited to 'tools/dockerfile/test/cxx_jessie_x64/Dockerfile') diff --git a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile index 15ace3ae2f..84cdc84658 100644 --- a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile @@ -32,13 +32,13 @@ FROM debian:jessie # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ - autotools-dev \ + autotools-dev \ build-essential \ bzip2 \ ccache \ curl \ gcc \ - gcc-multilib \ + gcc-multilib \ git \ golang \ gyp \ @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \ perl \ strace \ python-dev \ - python-setuptools \ + python-setuptools \ python-yaml \ telnet \ unzip \ @@ -76,13 +76,9 @@ RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat # Install dependencies RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y \ mono-devel \ - nunit \ - nunit-console \ - monodevelop - -# Download NuGet -RUN cd /var/local && wget www.nuget.org/NuGet.exe -ENV NUGET mono /var/local/NuGet.exe + ca-certificates-mono \ + nuget \ + && apt-get clean # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index d897c8fab0..2e2b341c68 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -32,13 +32,13 @@ FROM debian:jessie # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ - autotools-dev \ + autotools-dev \ build-essential \ bzip2 \ ccache \ curl \ gcc \ - gcc-multilib \ + gcc-multilib \ git \ golang \ gyp \ @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \ perl \ strace \ python-dev \ - python-setuptools \ + python-setuptools \ python-yaml \ telnet \ unzip \ diff --git a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index 519ab4a02a..39e125db7a 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -32,13 +32,13 @@ FROM 32bit/debian:jessie # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ - autotools-dev \ + autotools-dev \ build-essential \ bzip2 \ ccache \ curl \ gcc \ - gcc-multilib \ + gcc-multilib \ git \ golang \ gyp \ @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \ perl \ strace \ python-dev \ - python-setuptools \ + python-setuptools \ python-yaml \ telnet \ unzip \ diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile index 4d38edc1ea..9e25486f98 100644 --- a/tools/dockerfile/test/node_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile @@ -32,13 +32,13 @@ FROM debian:jessie # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ - autotools-dev \ + autotools-dev \ build-essential \ bzip2 \ ccache \ curl \ gcc \ - gcc-multilib \ + gcc-multilib \ git \ golang \ gyp \ @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \ perl \ strace \ python-dev \ - python-setuptools \ + python-setuptools \ python-yaml \ telnet \ unzip \ diff --git a/tools/dockerfile/test/php_jessie_x64/Dockerfile b/tools/dockerfile/test/php_jessie_x64/Dockerfile index c20c420fec..f840837ff9 100644 --- a/tools/dockerfile/test/php_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/php_jessie_x64/Dockerfile @@ -32,13 +32,13 @@ FROM debian:jessie # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ - autotools-dev \ + autotools-dev \ build-essential \ bzip2 \ ccache \ curl \ gcc \ - gcc-multilib \ + gcc-multilib \ git \ golang \ gyp \ @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \ perl \ strace \ python-dev \ - python-setuptools \ + python-setuptools \ python-yaml \ telnet \ unzip \ diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile index a6ce1b205d..2628d388f8 100644 --- a/tools/dockerfile/test/python_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile @@ -32,13 +32,13 @@ FROM debian:jessie # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ - autotools-dev \ + autotools-dev \ build-essential \ bzip2 \ ccache \ curl \ gcc \ - gcc-multilib \ + gcc-multilib \ git \ golang \ gyp \ @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \ perl \ strace \ python-dev \ - python-setuptools \ + python-setuptools \ python-yaml \ telnet \ unzip \ diff --git a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile index cdd017b07b..8cf03f58ce 100644 --- a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile @@ -32,13 +32,13 @@ FROM debian:jessie # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ - autotools-dev \ + autotools-dev \ build-essential \ bzip2 \ ccache \ curl \ gcc \ - gcc-multilib \ + gcc-multilib \ git \ golang \ gyp \ @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \ perl \ strace \ python-dev \ - python-setuptools \ + python-setuptools \ python-yaml \ telnet \ unzip \ diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index d82b8bb31c..317ad3217e 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -32,13 +32,13 @@ FROM debian:jessie # Install Git and basic packages. RUN apt-get update && apt-get install -y \ autoconf \ - autotools-dev \ + autotools-dev \ build-essential \ bzip2 \ ccache \ curl \ gcc \ - gcc-multilib \ + gcc-multilib \ git \ golang \ gyp \ @@ -52,7 +52,7 @@ RUN apt-get update && apt-get install -y \ perl \ strace \ python-dev \ - python-setuptools \ + python-setuptools \ python-yaml \ telnet \ unzip \ -- cgit v1.2.3 From 9b721f8711df29b1654899973709fe70a5b025ff Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 8 Feb 2016 16:55:07 -0800 Subject: addressing comments --- templates/tools/dockerfile/run_tests_addons.include | 3 --- templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template | 3 +++ templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template | 3 +++ templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template | 3 +++ templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template | 3 +++ templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template | 3 +++ templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template | 3 +++ templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template | 3 +++ templates/tools/dockerfile/test/sanity/Dockerfile.template | 1 + tools/dockerfile/test/csharp_jessie_x64/Dockerfile | 1 - tools/dockerfile/test/cxx_jessie_x64/Dockerfile | 1 - tools/dockerfile/test/cxx_jessie_x86/Dockerfile | 1 - tools/dockerfile/test/node_jessie_x64/Dockerfile | 1 - tools/dockerfile/test/php_jessie_x64/Dockerfile | 1 - tools/dockerfile/test/python_jessie_x64/Dockerfile | 1 - tools/dockerfile/test/ruby_jessie_x64/Dockerfile | 1 - 16 files changed, 22 insertions(+), 10 deletions(-) (limited to 'tools/dockerfile/test/cxx_jessie_x64/Dockerfile') diff --git a/templates/tools/dockerfile/run_tests_addons.include b/templates/tools/dockerfile/run_tests_addons.include index 78af3f6136..27ac67f5d8 100644 --- a/templates/tools/dockerfile/run_tests_addons.include +++ b/templates/tools/dockerfile/run_tests_addons.include @@ -5,6 +5,3 @@ RUN apt-get install -y libzookeeper-mt-dev RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template index 66e23505dd..1c01deac3d 100644 --- a/templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/csharp_jessie_x64/Dockerfile.template @@ -34,3 +34,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../csharp_deps.include"/> <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] + diff --git a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template index 913dfaaa6f..842c534805 100644 --- a/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_jessie_x64/Dockerfile.template @@ -34,3 +34,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] + \ No newline at end of file diff --git a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template index 576e1aaf40..4e95cdd65e 100644 --- a/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template +++ b/templates/tools/dockerfile/test/cxx_jessie_x86/Dockerfile.template @@ -34,3 +34,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../cxx_deps.include"/> <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] + \ No newline at end of file diff --git a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template index b5c2ca95d3..10551a574e 100644 --- a/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/node_jessie_x64/Dockerfile.template @@ -34,3 +34,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../node_deps.include"/> <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] + \ No newline at end of file diff --git a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template index 9e08b37c38..d7172398a9 100644 --- a/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template @@ -34,3 +34,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../php_deps.include"/> <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] + \ No newline at end of file diff --git a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template index a353a19ba9..9e68b3ef91 100644 --- a/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/python_jessie_x64/Dockerfile.template @@ -34,3 +34,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../python_deps.include"/> <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] + \ No newline at end of file diff --git a/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template b/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template index 1cc4a1078a..db777bebb4 100644 --- a/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template +++ b/templates/tools/dockerfile/test/ruby_jessie_x64/Dockerfile.template @@ -34,3 +34,6 @@ <%include file="../../apt_get_basic.include"/> <%include file="../../ruby_deps.include"/> <%include file="../../run_tests_addons.include"/> + # Define the default command. + CMD ["bash"] + \ No newline at end of file diff --git a/templates/tools/dockerfile/test/sanity/Dockerfile.template b/templates/tools/dockerfile/test/sanity/Dockerfile.template index b9982b0b0f..bbdb848599 100644 --- a/templates/tools/dockerfile/test/sanity/Dockerfile.template +++ b/templates/tools/dockerfile/test/sanity/Dockerfile.template @@ -48,3 +48,4 @@ # Define the default command. CMD ["bash"] + diff --git a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile index 84cdc84658..0052de6130 100644 --- a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile @@ -97,4 +97,3 @@ RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] - diff --git a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile index 2e2b341c68..e3ed39dfe6 100644 --- a/tools/dockerfile/test/cxx_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x64/Dockerfile @@ -84,4 +84,3 @@ RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] - diff --git a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile index 39e125db7a..9a8f2b1cca 100644 --- a/tools/dockerfile/test/cxx_jessie_x86/Dockerfile +++ b/tools/dockerfile/test/cxx_jessie_x86/Dockerfile @@ -84,4 +84,3 @@ RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] - diff --git a/tools/dockerfile/test/node_jessie_x64/Dockerfile b/tools/dockerfile/test/node_jessie_x64/Dockerfile index 9e25486f98..0655bf7179 100644 --- a/tools/dockerfile/test/node_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/node_jessie_x64/Dockerfile @@ -88,4 +88,3 @@ RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] - diff --git a/tools/dockerfile/test/php_jessie_x64/Dockerfile b/tools/dockerfile/test/php_jessie_x64/Dockerfile index f840837ff9..43081e7d38 100644 --- a/tools/dockerfile/test/php_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/php_jessie_x64/Dockerfile @@ -94,4 +94,3 @@ RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] - diff --git a/tools/dockerfile/test/python_jessie_x64/Dockerfile b/tools/dockerfile/test/python_jessie_x64/Dockerfile index 2628d388f8..7ed8b4c085 100644 --- a/tools/dockerfile/test/python_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/python_jessie_x64/Dockerfile @@ -95,4 +95,3 @@ RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] - diff --git a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile index 8cf03f58ce..91af772d72 100644 --- a/tools/dockerfile/test/ruby_jessie_x64/Dockerfile +++ b/tools/dockerfile/test/ruby_jessie_x64/Dockerfile @@ -95,4 +95,3 @@ RUN mkdir /var/local/jenkins # Define the default command. CMD ["bash"] - -- cgit v1.2.3