From 1978e26119257178b4274d5112194a97e3f2b90d Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 8 Feb 2016 11:45:13 -0800 Subject: [PATCH] regenerated dockerfiles --- .../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 +++--- .../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(-) diff --git a/tools/dockerfile/test/csharp_jessie_x64/Dockerfile b/tools/dockerfile/test/csharp_jessie_x64/Dockerfile index 15ace3ae2f1..84cdc84658c 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 d897c8fab09..2e2b341c687 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 519ab4a02ac..39e125db7a5 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 4d38edc1ea5..9e25486f982 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 c20c420fecb..f840837ff99 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 a6ce1b205d5..2628d388f8e 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 cdd017b07ba..8cf03f58ce1 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 d82b8bb31cd..317ad3217ef 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 \