Update sample

Author: aensidhe

samples/docker-compose/dotnet/Dockerfile

@@ -1,12 +1,12 @@
-FROM progaudi/dotnet:1.0.1-xenial
+FROM microsoft/dotnet:2.0.0-sdk
 
 WORKDIR /app
 ADD dotnet.csproj /app/dotnet.csproj
-RUN /root/.dotnet/dotnet restore
+RUN dotnet restore
 
 ADD . /app
-RUN /root/.dotnet/dotnet build -c Release -f netcoreapp1.1 /app/dotnet.csproj
+RUN dotnet build -c Release -f netcoreapp2.0 /app/dotnet.csproj
 
 EXPOSE 5000/tcp
 
-CMD ["/root/.dotnet/dotnet", "run", "--server.urls", "http://*:5000"]
+CMD ["dotnet", "run", "--server.urls", "http://*:5000"]

samples/docker-compose/dotnet/Program.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 
@@ -10,13 +10,12 @@ public static void Main(string[] args)
         {
             var config = new ConfigurationBuilder()
                 .AddCommandLine(args)
-                .AddEnvironmentVariables(prefix: "ASPNETCORE_")
+                .AddEnvironmentVariables("ASPNETCORE_")
                 .Build();
 
-            var host = new WebHostBuilder()
+            var host = WebHost
+                .CreateDefaultBuilder(args)
                 .UseConfiguration(config)
-                .UseKestrel()
-                .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseStartup<Startup>()
                 .Build();
 

samples/docker-compose/dotnet/Views/Home/DogTablePartial.cshtml

@@ -24,7 +24,7 @@
         </tbody>
         <tfoot>
             <tr>
-                <td colspan="3">@Model.Dogs.Count dogs total</td>
+                <td colspan="4">@Model.Dogs.Count dogs total</td>
             </tr>
         </tfoot>
     </table>

samples/docker-compose/dotnet/Views/Home/Index.cshtml

@@ -4,6 +4,8 @@
     ViewData["Title"] = "Tarantool demo page";
 }
 
+<h1>Render time is @DateTimeOffset.Now.ToString("F")</h1>
+
 @Html.Partial("DogTablePartial", new DogTable(Model[0], "All dogs in Tarantool"))
 
 @Html.Partial("DogTablePartial", new DogTable(Model[1], "Senior dogs in Tarantool"))

samples/docker-compose/dotnet/dotnet.csproj

@@ -1,22 +1,12 @@
-<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <PreserveCompilationContext>true</PreserveCompilationContext>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Folder Include="wwwroot\" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="progaudi.tarantool" Version="0.9.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.0" />
-    <PackageReference Include="msgpack.light" Version="1.3.0" />
-    <PackageReference Include="progaudi.tarantool" Version="0.8.0" />
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
   </ItemGroup>
-</Project>
+</Project>