diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-09-25 12:38:17 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-09-25 12:38:17 -0700 |
| commit | 1c285b98122ef8fe31aa3325a4c10f5b05107ca8 (patch) | |
| tree | f811ca6879a76bb526a7af7a35e987780d1bcba8 /tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile | |
| parent | d4bb9bddd6cd1bfa4829deee9c3163c6065dafcb (diff) | |
| parent | 008a173a7e2ba1d5c0933aa7a77395945ba2024d (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
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 |