diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2016-09-06 11:41:26 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-09-06 11:41:26 -0700 |
| commit | 74c92f62d9e8d2be9f74b5fd349b6a5c519cf82f (patch) | |
| tree | c9bad1185c893bbb828995e4bfda02ebe73ab149 /tools | |
| parent | d57bbe7f8fda6d6146f47319db319610ec908e48 (diff) | |
| parent | cdbe6b3963528167ba581fb039b8fa9e5e0ea34f (diff) | |
Merge pull request #7848 from nicolasnoble/upmerge-from-v1.0.x
Manual upmerge from v1.0.x
Diffstat (limited to 'tools')
7 files changed, 14 insertions, 0 deletions
diff --git a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile index c917b29113..0ab12873f7 100644 --- a/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_centos7_x64/Dockerfile @@ -35,3 +35,5 @@ RUN yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ RUN yum install -y mono RUN yum install -y unzip RUN yum install -y nuget + +RUN nuget update -self diff --git a/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile index 249095a47b..9ef02721bb 100644 --- a/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_jessie_x64/Dockerfile @@ -40,4 +40,6 @@ RUN apt-get update && apt-get install -y \ ca-certificates-mono \ nuget +RUN nuget update -self + RUN apt-get update && apt-get install -y unzip diff --git a/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile index 9eda551d9c..2ccad44af2 100644 --- a/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_jessie_x86/Dockerfile @@ -40,4 +40,6 @@ RUN apt-get update && apt-get install -y \ ca-certificates-mono \ nuget +RUN nuget update -self + RUN apt-get update && apt-get install -y unzip diff --git a/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile index 85daea450d..d283ad2739 100644 --- a/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_ubuntu1404_x64/Dockerfile @@ -37,4 +37,6 @@ RUN apt-get update && apt-get install -y \ ca-certificates-mono \ nuget +RUN nuget update -self + RUN apt-get update && apt-get install -y unzip diff --git a/tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile index ec16105155..3510398789 100644 --- a/tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_ubuntu1504_x64/Dockerfile @@ -37,4 +37,6 @@ RUN apt-get update && apt-get install -y \ ca-certificates-mono \ nuget +RUN nuget update -self + RUN apt-get update && apt-get install -y unzip diff --git a/tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile index 110aa2ab86..ae2b678a04 100644 --- a/tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_ubuntu1510_x64/Dockerfile @@ -37,4 +37,6 @@ RUN apt-get update && apt-get install -y \ ca-certificates-mono \ nuget +RUN nuget update -self + RUN apt-get update && apt-get install -y unzip diff --git a/tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile b/tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile index 4ef076669b..597d7e4a79 100644 --- a/tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile +++ b/tools/dockerfile/distribtest/csharp_ubuntu1604_x64/Dockerfile @@ -34,4 +34,6 @@ RUN apt-get update && apt-get install -y \ ca-certificates-mono \ nuget +RUN nuget update -self + RUN apt-get update && apt-get install -y unzip |