diff options
| author |  Mark D. Roth <roth@google.com> | 2017-03-15 08:06:21 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2017-03-15 08:06:21 -0700 |
| commit | 3a91707acefc5e099f37ee24c19abfd16fabef8b (patch) | |
| tree | a4a7837b399ca19105a0e807ea93a12d7814bc8e /tools/dockerfile/test/csharp_coreclr_x64 | |
| parent | 02612c163e949ed70a399cf9dd311457bb29c902 (diff) | |
| parent | 3cafec2f55f66e3df61569579c8259b2e5b5ee00 (diff) | |
Merge remote-tracking branch 'upstream/master' into retry_throttle
Diffstat (limited to 'tools/dockerfile/test/csharp_coreclr_x64')
| -rw-r--r-- | tools/dockerfile/test/csharp_coreclr_x64/Dockerfile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/dockerfile/test/csharp_coreclr_x64/Dockerfile b/tools/dockerfile/test/csharp_coreclr_x64/Dockerfile index efe6e39118..c26c9a2826 100644 --- a/tools/dockerfile/test/csharp_coreclr_x64/Dockerfile +++ b/tools/dockerfile/test/csharp_coreclr_x64/Dockerfile @@ -76,7 +76,7 @@ RUN apt-get update && apt-get install -y \ # Install Python packages from PyPI RUN pip install pip --upgrade RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 six==1.10.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 six==1.10.0 #================ # C# dependencies @@ -99,8 +99,12 @@ RUN nuget update -self # Install dotnet SDK based on https://www.microsoft.com/net/core#debian RUN apt-get update && apt-get install -y curl libunwind8 gettext -RUN curl -sSL -o dotnet.tar.gz https://go.microsoft.com/fwlink/?LinkID=809130 -RUN mkdir -p /opt/dotnet && tar zxf dotnet.tar.gz -C /opt/dotnet +# dotnet-dev-1.0.0-preview2-003121 +RUN curl -sSL -o dotnet100.tar.gz https://go.microsoft.com/fwlink/?LinkID=809130 +RUN mkdir -p /opt/dotnet && tar zxf dotnet100.tar.gz -C /opt/dotnet +# dotnet-dev-1.0.1 +RUN curl -sSL -o dotnet101.tar.gz https://go.microsoft.com/fwlink/?LinkID=843453 +RUN mkdir -p /opt/dotnet && tar zxf dotnet101.tar.gz -C /opt/dotnet RUN ln -s /opt/dotnet/dotnet /usr/local/bin # Trigger the population of the local package cache |