diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-09-22 15:24:44 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-09-22 15:24:44 -0700 |
| commit | f7d8860f4ff688e966159f31e2c281a22e2aa3f4 (patch) | |
| tree | 9367583b04c0e9464c6f091d699dfc64ba63a7f8 /tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile | |
| parent | 76e0c1ddd536342bdc5059209da38d5406c7e717 (diff) | |
| parent | 31c66c576ad00504b34182340f8ff21bc3f447fb (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-eos
Diffstat (limited to 'tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile')
| -rw-r--r-- | tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile index 71845b590b..758f314572 100644 --- a/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile @@ -14,18 +14,15 @@ FROM 32bit/debian:jessie -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF -RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +RUN echo "deb http://download.mono-project.com/repo/debian jessie main" | tee /etc/apt/sources.list.d/mono-official.list RUN echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list -RUN echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | tee -a /etc/apt/sources.list.d/mono-xamarin.list RUN apt-get update && apt-get install -y \ mono-devel \ ca-certificates-mono \ - nuget + nuget \ + && apt-get clean -# make sure we have nuget 2.12+ (in case there's an older cached docker image) -RUN apt-get update && apt-get install -y nuget - -RUN apt-get update && apt-get install -y unzip +RUN apt-get update && apt-get install -y unzip && apt-get clean |