diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-09-18 11:55:52 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-09-18 11:55:52 -0700 |
| commit | b352be025fcb117d2deca24ada9e90d94eba460c (patch) | |
| tree | 7666446253d7cdbfa1b6c57a721329e32fef4a50 /tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile | |
| parent | 63f31e8cd16b185fd735bd753afbc0375cd573aa (diff) | |
| parent | a5b571e22d8e3d06fbdecfc1a6e67a3036be536e (diff) | |
Upmerge from v1.6.x branch to master
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 |