diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-09-29 01:31:54 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-09-29 01:31:54 +0200 |
| commit | 87a108121134e9603e3e60e732b23cbeb619be14 (patch) | |
| tree | f19efe6ed3dc6706b21fc9138a975fce74d66783 /tools/dockerfile/distribtest | |
| parent | b97f867b390193daf18988958183143726602727 (diff) | |
| parent | 4f13db3c6cfaae52b6d7e35edaa352bccff70b66 (diff) | |
Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under
Diffstat (limited to 'tools/dockerfile/distribtest')
| -rw-r--r-- | tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile | 10 | ||||
| -rw-r--r-- | tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile | 4 |
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 |