Merge branch 'master' into stazz/NuGetUtilsUpdate

stazz · web-flow · commit 9d8eb3806d86 · 2019-03-19T19:36:49.000+02:00
diff --git a/src/Docker/windows/nano/netcoreapp2.1/Dockerfile b/src/Docker/windows/nano/netcoreapp2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/runtime:2.1
+FROM microsoft/dotnet:2.1-runtime
 LABEL maintainers="GitTools Maintainers"
 ARG contentFolder
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/dotnet/core/runtime:2.1`
	`1`	`+FROM microsoft/dotnet:2.1-runtime`
`2`	`2`	`LABEL maintainers="GitTools Maintainers"`
`3`	`3`	`ARG contentFolder`
`4`	`4`