aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'tools/dockerfile')
-rw-r--r--tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile10
-rw-r--r--tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile4
2 files changed, 10 insertions, 4 deletions
diff --git a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile
index 6584845721..c8b5daaff9 100644
--- a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile
@@ -33,7 +33,17 @@ RUN rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E03
RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/
RUN yum install -y mono
+
RUN yum install -y unzip
# --nogpgcheck because nuget-2.12 package is not signed.
RUN yum install -y nuget --nogpgcheck
+
+# Help mono correctly locate libMonoPosixHelper.so
+# as a workaround for issue https://bugzilla.xamarin.com/show_bug.cgi?id=42820
+# The error message you'll get without this workaround:
+# ```
+# WARNING: /usr/lib/libMonoPosixHelper.so
+# WARNING: Unable to read package from path 'Grpc.1.1.0-dev.nupkg'.
+# ```
+RUN cp /usr/lib64/libMonoPosixHelper.so /usr/lib/
diff --git a/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile
index 1f9a42e13f..ed6d87b228 100644
--- a/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile
+++ b/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile
@@ -54,7 +54,3 @@ RUN mkdir warmup \
&& dotnet new \
&& cd .. \
&& rm -rf warmup
-
-# TODO(jtattermusch): without libc-dev, netcoreapp1.0 targets fail with
-# System.DllNotFoundException: Unable to load DLL 'libdl.so'
-RUN apt-get install -y libc-dev \ No newline at end of file