Change branding of Windows Server, version 2009 to 20H2 (dotnet#2405)

MichaelSimons · Dec 7, 2020 · 21156c3 · 21156c3
1 parent a104d42
commit 21156c3
Show file tree

Hide file tree

Showing 30 changed files with 183 additions and 109 deletions.
diff --git a/README.aspnet.md b/README.aspnet.md
@@ -87,12 +87,12 @@ Tags | Dockerfile | OS Version
 2.1.23-focal-arm32v7, 2.1-focal-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 2.1.23-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
-## Nano Server, version 2009 amd64 Tags
+## Nano Server, version 20H2 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-nanoserver-2009, 5.0-nanoserver-2009, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-2009/amd64/Dockerfile)
-3.1.10-nanoserver-2009, 3.1-nanoserver-2009, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-2009/amd64/Dockerfile)
-2.1.23-nanoserver-2009, 2.1-nanoserver-2009, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-2009/amd64/Dockerfile)
+5.0.0-nanoserver-20H2, 5.0-nanoserver-20H2, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/5.0/nanoserver-20H2/amd64/Dockerfile)
+3.1.10-nanoserver-20H2, 3.1-nanoserver-20H2, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/3.1/nanoserver-20H2/amd64/Dockerfile)
+2.1.23-nanoserver-20H2, 2.1-nanoserver-20H2, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/aspnet/2.1/nanoserver-20H2/amd64/Dockerfile)
 
 ## Nano Server, version 2004 amd64 Tags
 Tag | Dockerfile

diff --git a/README.runtime.md b/README.runtime.md
@@ -83,12 +83,12 @@ Tags | Dockerfile | OS Version
 2.1.23-focal-arm32v7, 2.1-focal-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 2.1.23-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
-## Nano Server, version 2009 amd64 Tags
+## Nano Server, version 20H2 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.0-nanoserver-2009, 5.0-nanoserver-2009, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-2009/amd64/Dockerfile)
-3.1.10-nanoserver-2009, 3.1-nanoserver-2009, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-2009/amd64/Dockerfile)
-2.1.23-nanoserver-2009, 2.1-nanoserver-2009, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-2009/amd64/Dockerfile)
+5.0.0-nanoserver-20H2, 5.0-nanoserver-20H2, 5.0.0, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/5.0/nanoserver-20H2/amd64/Dockerfile)
+3.1.10-nanoserver-20H2, 3.1-nanoserver-20H2, 3.1.10, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/3.1/nanoserver-20H2/amd64/Dockerfile)
+2.1.23-nanoserver-20H2, 2.1-nanoserver-20H2, 2.1.23, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/runtime/2.1/nanoserver-20H2/amd64/Dockerfile)
 
 ## Nano Server, version 2004 amd64 Tags
 Tag | Dockerfile

diff --git a/README.samples.md b/README.samples.md
@@ -77,11 +77,11 @@ Tags | Dockerfile | OS Version
 dotnetapp-buster-slim-arm64v8, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile) | Debian 10
 aspnetapp-buster-slim-arm64v8, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile) | Debian 10
 
-## Nano Server, version 2009 amd64 Tags
+## Nano Server, version 20H2 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-dotnetapp-nanoserver-2009, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)
-aspnetapp-nanoserver-2009, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile)
+dotnetapp-nanoserver-20H2, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile)
+aspnetapp-nanoserver-20H2, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile)
 
 ## Nano Server, version 2004 amd64 Tags
 Tag | Dockerfile

diff --git a/README.sdk.md b/README.sdk.md
@@ -91,12 +91,12 @@ Tags | Dockerfile | OS Version
 2.1.811-focal-arm32v7, 2.1-focal-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04
 2.1.811-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/bionic/arm32v7/Dockerfile) | Ubuntu 18.04
 
-## Nano Server, version 2009 amd64 Tags
+## Nano Server, version 20H2 amd64 Tags
 Tag | Dockerfile
 ---------| ---------------
-5.0.100-nanoserver-2009, 5.0-nanoserver-2009, 5.0.100, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-2009/amd64/Dockerfile)
-3.1.404-nanoserver-2009, 3.1-nanoserver-2009, 3.1.404, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-2009/amd64/Dockerfile)
-2.1.811-nanoserver-2009, 2.1-nanoserver-2009, 2.1.811, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-2009/amd64/Dockerfile)
+5.0.100-nanoserver-20H2, 5.0-nanoserver-20H2, 5.0.100, 5.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/5.0/nanoserver-20H2/amd64/Dockerfile)
+3.1.404-nanoserver-20H2, 3.1-nanoserver-20H2, 3.1.404, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/3.1/nanoserver-20H2/amd64/Dockerfile)
+2.1.811-nanoserver-20H2, 2.1-nanoserver-20H2, 2.1.811, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/src/sdk/2.1/nanoserver-20H2/amd64/Dockerfile)
 
 ## Nano Server, version 2004 amd64 Tags
 Tag | Dockerfile

diff --git a/documentation/scenarios/installing-dotnet.md b/documentation/scenarios/installing-dotnet.md
@@ -70,7 +70,7 @@ RUN curl -SL --output dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Runti
 Example (Windows):
 
 ```Dockerfile
-FROM mcr.microsoft.com/windows/servercore:2009
+FROM mcr.microsoft.com/windows/servercore:20H2
 
 # Install .NET
 ENV DOTNET_VERSION=5.0.0
@@ -168,7 +168,7 @@ Example (Windows):
 ```Dockerfile
 # escape=`
 
-FROM mcr.microsoft.com/windows/servercore:2009
+FROM mcr.microsoft.com/windows/servercore:20H2
 RUN powershell -Command `
         $ErrorActionPreference = 'Stop'; `
         $ProgressPreference = 'SilentlyContinue'; `

diff --git a/documentation/scenarios/using-system-drawing-common.md b/documentation/scenarios/using-system-drawing-common.md
@@ -39,7 +39,7 @@ You have two deployment options available: you can choose to use a [framework-de
 A self-contained deployment is particularly handy in this scenario where there's a dependency on the System.Drawing.Common package. This is because there's no need to use a base image that has .NET installed. By deploying your app and all of its .NET dependencies, you can select the particular Windows base image that meets your need. In this example, since Windows Server Core has the required files and Nano Server does not, you can simply select a Windows Server Core image to use as your base image.
 
 ```Dockerfile
-FROM mcr.microsoft.com/dotnet/sdk:3.1-nanoserver-2009 AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1-nanoserver-20H2 AS build
 
 WORKDIR /app
 
@@ -53,7 +53,7 @@ RUN dotnet publish -c Release -o out -r win-x64 --self-contained true
 
 
 # reference the Server Core image from the windows repo
-FROM mcr.microsoft.com/windows/servercore:2009 AS runtime
+FROM mcr.microsoft.com/windows/servercore:20H2 AS runtime
 WORKDIR /app
 COPY --from=build /app/out ./
 
@@ -67,7 +67,7 @@ For a framework-dependent deployment, you're relying on .NET being installed in
 Follow the instructions for [Installing .NET in a Dockerfile](installing-dotnet.md) in order to create a custom image based on [Windows Server Core](https://hub.docker.com/_/microsoft-windows-servercore) or [Windows](https://hub.docker.com/_/microsoft-windows) that has .NET Core installed. For this example, let's say that you've tagged your image as `servercore/runtime:3.1`. You can then construct your application's Dockerfile to reference that tag as the base image:
 
 ```Dockerfile
-FROM mcr.microsoft.com/dotnet/sdk:3.1-nanoserver-2009 AS build
+FROM mcr.microsoft.com/dotnet/sdk:3.1-nanoserver-20H2 AS build
 
 WORKDIR /app
 

diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml
@@ -25,9 +25,9 @@ $(McrTagsYmlTagGroup:3.1-bionic-arm32v7)
 $(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7)
 $(McrTagsYmlTagGroup:2.1-focal-arm32v7)
 $(McrTagsYmlTagGroup:2.1-bionic-arm32v7)
-$(McrTagsYmlTagGroup:5.0-nanoserver-2009)
-$(McrTagsYmlTagGroup:3.1-nanoserver-2009)
-$(McrTagsYmlTagGroup:2.1-nanoserver-2009)
+$(McrTagsYmlTagGroup:5.0-nanoserver-20H2)
+$(McrTagsYmlTagGroup:3.1-nanoserver-20H2)
+$(McrTagsYmlTagGroup:2.1-nanoserver-20H2)
 $(McrTagsYmlTagGroup:5.0-nanoserver-2004)
 $(McrTagsYmlTagGroup:3.1-nanoserver-2004)
 $(McrTagsYmlTagGroup:2.1-nanoserver-2004)

diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml
@@ -25,9 +25,9 @@ $(McrTagsYmlTagGroup:3.1-bionic-arm32v7)
 $(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7)
 $(McrTagsYmlTagGroup:2.1-focal-arm32v7)
 $(McrTagsYmlTagGroup:2.1-bionic-arm32v7)
-$(McrTagsYmlTagGroup:5.0-nanoserver-2009)
-$(McrTagsYmlTagGroup:3.1-nanoserver-2009)
-$(McrTagsYmlTagGroup:2.1-nanoserver-2009)
+$(McrTagsYmlTagGroup:5.0-nanoserver-20H2)
+$(McrTagsYmlTagGroup:3.1-nanoserver-20H2)
+$(McrTagsYmlTagGroup:2.1-nanoserver-20H2)
 $(McrTagsYmlTagGroup:5.0-nanoserver-2004)
 $(McrTagsYmlTagGroup:3.1-nanoserver-2004)
 $(McrTagsYmlTagGroup:2.1-nanoserver-2004)

diff --git a/eng/mcr-tags-metadata-templates/samples-tags.yml b/eng/mcr-tags-metadata-templates/samples-tags.yml
@@ -5,8 +5,8 @@ $(McrTagsYmlTagGroup:dotnetapp-buster-slim-arm32v7)
 $(McrTagsYmlTagGroup:aspnetapp-buster-slim-arm32v7)
 $(McrTagsYmlTagGroup:dotnetapp-buster-slim-arm64v8)
 $(McrTagsYmlTagGroup:aspnetapp-buster-slim-arm64v8)
-$(McrTagsYmlTagGroup:dotnetapp-nanoserver-2009)
-$(McrTagsYmlTagGroup:aspnetapp-nanoserver-2009)
+$(McrTagsYmlTagGroup:dotnetapp-nanoserver-20H2)
+$(McrTagsYmlTagGroup:aspnetapp-nanoserver-20H2)
 $(McrTagsYmlTagGroup:dotnetapp-nanoserver-2004)
 $(McrTagsYmlTagGroup:aspnetapp-nanoserver-2004)
 $(McrTagsYmlTagGroup:dotnetapp-nanoserver-1909)

diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml
@@ -23,9 +23,9 @@ $(McrTagsYmlTagGroup:3.1-bionic-arm32v7)
 $(McrTagsYmlTagGroup:2.1-stretch-arm32v7)
 $(McrTagsYmlTagGroup:2.1-focal-arm32v7)
 $(McrTagsYmlTagGroup:2.1-bionic-arm32v7)
-$(McrTagsYmlTagGroup:5.0-nanoserver-2009)
-$(McrTagsYmlTagGroup:3.1-nanoserver-2009)
-$(McrTagsYmlTagGroup:2.1-nanoserver-2009)
+$(McrTagsYmlTagGroup:5.0-nanoserver-20H2)
+$(McrTagsYmlTagGroup:3.1-nanoserver-20H2)
+$(McrTagsYmlTagGroup:2.1-nanoserver-20H2)
 $(McrTagsYmlTagGroup:5.0-nanoserver-2004)
 $(McrTagsYmlTagGroup:3.1-nanoserver-2004)
 $(McrTagsYmlTagGroup:2.1-nanoserver-2004)