From ca9c525ae8b0b5bd521cf02849c5ce5cfd3e9efc Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 2 Feb 2016 13:40:54 -0800 Subject: [PATCH 1/2] Also install nuget for the centos test --- tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile index ae21dec2cad..f2271289527 100644 --- a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile @@ -35,4 +35,5 @@ RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ RUN yum install -y mono RUN yum install -y git RUN yum install -y unzip +RUN yum install -y nuget From 5a8ea29ed030ae01610ddbe996af6a01cdd85255 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 2 Feb 2016 15:07:44 -0800 Subject: [PATCH 2/2] libc6-dev no longer required for C# --- tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile | 1 - tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile | 4 ---- tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile | 4 ---- tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile | 4 ---- 4 files changed, 13 deletions(-) diff --git a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile index f2271289527..17e9698904c 100644 --- a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile @@ -36,4 +36,3 @@ RUN yum install -y mono RUN yum install -y git RUN yum install -y unzip RUN yum install -y nuget - diff --git a/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile index ec400b61515..b31f38afc77 100644 --- a/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile @@ -41,7 +41,3 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y \ nuget RUN apt-get update && apt-get install -y git unzip - -# TODO(jtattermusch): Currently P/Invoke to dlopen will fail without libc6-dev -# being installed. Figure out how to workaround this. -RUN apt-get update && apt-get install -y libc6-dev diff --git a/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile index f8e6401a63e..dd5dee75b87 100644 --- a/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile @@ -41,7 +41,3 @@ RUN apt-get update && apt-get -y dist-upgrade && apt-get install -y \ nuget RUN apt-get update && apt-get install -y git unzip - -# TODO(jtattermusch): Currently P/Invoke to dlopen will fail without libc6-dev -# being installed. Figure out how to workaround this. -RUN apt-get update && apt-get install -y libc6-dev diff --git a/tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile index 4f54f14f074..dd865e8bbc5 100644 --- a/tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_wheezy_x64/Dockerfile @@ -30,7 +30,3 @@ FROM mono:4.2.2.30 RUN apt-get update && apt-get install -y git unzip - -# TODO(jtattermusch): Currently P/Invoke to dlopen will fail without libc6-dev -# being installed. Figure out how to workaround this. -RUN apt-get update && apt-get install -y libc6-dev