dotnet
/
dotnet-docker
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
Matt Thalman 2020-12-07 09:59:39 -06:00
Родитель a104d42825
Коммит 21156c38a3
30 изменённых файлов: 183 добавлений и 109 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
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

8
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

6
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

8
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

4
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'; `

6
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

6
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)

6
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)

4
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)

6
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)

126
manifest.json
Просмотреть файл

@ -736,17 +736,21 @@
}
},
{
"dockerfile": "src/runtime/2.1/nanoserver-2009/amd64",
"dockerfile": "src/runtime/2.1/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/runtime/2.1/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(dotnet|2.1|product-version)-nanoserver-20H2": {},
"2.1-nanoserver-20H2": {},
"$(dotnet|2.1|product-version)-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedRuntimeRepo)"
}
},
"2.1-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedRuntimeRepo)"
}
@ -1053,17 +1057,21 @@
}
},
{
"dockerfile": "src/runtime/3.1/nanoserver-2009/amd64",
"dockerfile": "src/runtime/3.1/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/runtime/3.1/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(dotnet|3.1|product-version)-nanoserver-20H2": {},
"3.1-nanoserver-20H2": {},
"$(dotnet|3.1|product-version)-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedRuntimeRepo)"
}
},
"3.1-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedRuntimeRepo)"
}
@ -1391,13 +1399,19 @@
}
},
{
"dockerfile": "src/runtime/5.0/nanoserver-2009/amd64",
"dockerfile": "src/runtime/5.0/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/runtime/5.0/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(dotnet|5.0|product-version)-nanoserver-2009": {},
"5.0-nanoserver-2009": {}
"$(dotnet|5.0|product-version)-nanoserver-20H2": {},
"5.0-nanoserver-20H2": {},
"$(dotnet|5.0|product-version)-nanoserver-2009": {
"docType": "Undocumented"
},
"5.0-nanoserver-2009": {
"docType": "Undocumented"
}
}
}
]
@ -1739,17 +1753,29 @@
]
},
{
"dockerfile": "src/aspnet/2.1/nanoserver-2009/amd64",
"dockerfile": "src/aspnet/2.1/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/aspnet/2.1/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(dotnet|2.1|product-version)-nanoserver-20H2": {
"syndication": {
"repo": "$(syndicatedAspnetRepo)"
}
},
"2.1-nanoserver-20H2": {
"syndication": {
"repo": "$(syndicatedAspnetRepo)"
}
},
"$(dotnet|2.1|product-version)-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedAspnetRepo)"
}
},
"2.1-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedAspnetRepo)"
}
@ -1760,7 +1786,7 @@
"name": "test-dependencies",
"type": "Integral",
"dependencies": [
"$(Repo:runtime):2.1-nanoserver-2009"
"$(Repo:runtime):2.1-nanoserver-20H2"
]
}
]
@ -2080,17 +2106,29 @@
"buildArgs": {
"REPO": "$(Repo:runtime)"
},
"dockerfile": "src/aspnet/3.1/nanoserver-2009/amd64",
"dockerfile": "src/aspnet/3.1/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/aspnet/3.1/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(dotnet|3.1|product-version)-nanoserver-20H2": {
"syndication": {
"repo": "$(syndicatedAspnetRepo)"
}
},
"3.1-nanoserver-20H2": {
"syndication": {
"repo": "$(syndicatedAspnetRepo)"
}
},
"$(dotnet|3.1|product-version)-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedAspnetRepo)"
}
},
"3.1-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedAspnetRepo)"
}
@ -2430,13 +2468,19 @@
"buildArgs": {
"REPO": "$(Repo:runtime)"
},
"dockerfile": "src/aspnet/5.0/nanoserver-2009/amd64",
"dockerfile": "src/aspnet/5.0/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/aspnet/5.0/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(dotnet|5.0|product-version)-nanoserver-2009": {},
"5.0-nanoserver-2009": {}
"$(dotnet|5.0|product-version)-nanoserver-20H2": {},
"5.0-nanoserver-20H2": {},
"$(dotnet|5.0|product-version)-nanoserver-2009": {
"docType": "Undocumented"
},
"5.0-nanoserver-2009": {
"docType": "Undocumented"
}
}
}
]
@ -2793,17 +2837,29 @@
]
},
{
"dockerfile": "src/sdk/2.1/nanoserver-2009/amd64",
"dockerfile": "src/sdk/2.1/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/sdk/2.1/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(sdk|2.1|product-version)-nanoserver-20H2": {
"syndication": {
"repo": "$(syndicatedSdkRepo)"
}
},
"2.1-nanoserver-20H2": {
"syndication": {
"repo": "$(syndicatedSdkRepo)"
}
},
"$(sdk|2.1|product-version)-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedSdkRepo)"
}
},
"2.1-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedSdkRepo)"
}
@ -2814,7 +2870,7 @@
"name": "test-dependencies",
"type": "Integral",
"dependencies": [
"$(Repo:aspnet):2.1-nanoserver-2009"
"$(Repo:aspnet):2.1-nanoserver-20H2"
]
}
]
@ -3176,17 +3232,29 @@
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/sdk/3.1/nanoserver-2009/amd64",
"dockerfile": "src/sdk/3.1/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/sdk/3.1/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(sdk|3.1|product-version)-nanoserver-20H2": {
"syndication": {
"repo": "$(syndicatedSdkRepo)"
}
},
"3.1-nanoserver-20H2": {
"syndication": {
"repo": "$(syndicatedSdkRepo)"
}
},
"$(sdk|3.1|product-version)-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedSdkRepo)"
}
},
"3.1-nanoserver-2009": {
"docType": "Undocumented",
"syndication": {
"repo": "$(syndicatedSdkRepo)"
}
@ -3520,13 +3588,19 @@
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/sdk/5.0/nanoserver-2009/amd64",
"dockerfile": "src/sdk/5.0/nanoserver-20H2/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/sdk/5.0/Dockerfile.nanoserver",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"$(sdk|5.0|product-version)-nanoserver-2009": {},
"5.0-nanoserver-2009": {}
"$(sdk|5.0|product-version)-nanoserver-20H2": {},
"5.0-nanoserver-20H2": {},
"$(sdk|5.0|product-version)-nanoserver-2009": {
"docType": "Undocumented"
},
"5.0-nanoserver-2009": {
"docType": "Undocumented"
}
}
}
]

10
manifest.samples.json
Просмотреть файл

@ -69,9 +69,9 @@
{
"dockerfile": "samples/dotnetapp",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"dotnetapp-nanoserver-2009": {}
"dotnetapp-nanoserver-20H2": {}
}
}
]
@ -190,16 +190,16 @@
{
"dockerfile": "samples/aspnetapp",
"os": "windows",
"osVersion": "nanoserver-2009",
"osVersion": "nanoserver-20H2",
"tags": {
"aspnetapp-nanoserver-2009": {}
"aspnetapp-nanoserver-20H2": {}
},
"customBuildLegGroups": [
{
"name": "pr-build",
"type": "Integral",
"dependencies": [
"$(Repo:samples):dotnetapp-nanoserver-2009"
"$(Repo:samples):dotnetapp-nanoserver-20H2"
]
}
]

4
samples/aspnetapp/Dockerfile.nanoserver-x64
Просмотреть файл

@ -13,8 +13,8 @@ WORKDIR /source/aspnetapp
RUN dotnet publish -c release -o /app -r win-x64 --self-contained false --no-restore
# final stage/image
# Uses the 2009 release; 2004, 1909, and 1809 are other choices
FROM mcr.microsoft.com/dotnet/aspnet:5.0-nanoserver-2009 AS runtime
# Uses the 20H2 release; 2004, 1909, and 1809 are other choices
FROM mcr.microsoft.com/dotnet/aspnet:5.0-nanoserver-20H2 AS runtime
WORKDIR /app
COPY --from=build /app ./
ENTRYPOINT ["aspnetapp"]

4
samples/aspnetapp/Dockerfile.nanoserver-x64-slim
Просмотреть файл

@ -15,8 +15,8 @@ WORKDIR /source/aspnetapp
RUN dotnet publish -c release -o /app -r win-x64 --self-contained true --no-restore /p:PublishTrimmed=true /p:PublishReadyToRun=true
# final stage/image
# Uses the 2009 release; 2004, 1909, and 1809 are other choices
FROM mcr.microsoft.com/windows/nanoserver:2009 AS runtime
# Uses the 20H2 release; 2004, 1909, and 1809 are other choices
FROM mcr.microsoft.com/windows/nanoserver:20H2 AS runtime
WORKDIR /app
COPY --from=build /app ./

4
samples/dotnetapp/Dockerfile.nanoserver-x64
Просмотреть файл

@ -11,8 +11,8 @@ COPY . .
RUN dotnet publish -c release -o /app -r win-x64 --self-contained false --no-restore
# final stage/image
# Uses the 2009 release; Other choices: 2004, 1909, 1809
FROM mcr.microsoft.com/dotnet/runtime:5.0-nanoserver-2009
# Uses the 20H2 release; Other choices: 2004, 1909, 1809
FROM mcr.microsoft.com/dotnet/runtime:5.0-nanoserver-20H2
WORKDIR /app
COPY --from=build /app .
ENTRYPOINT ["dotnetapp"]

4
samples/dotnetapp/Dockerfile.nanoserver-x64-slim
Просмотреть файл

@ -11,8 +11,8 @@ COPY . .
RUN dotnet publish -c release -o /app -r win-x64 --self-contained true --no-restore /p:PublishTrimmed=true /p:PublishReadyToRun=true
# final stage/image
# Uses the 2009 release; Other choices: 2004, 1909, 1809
FROM mcr.microsoft.com/windows/nanoserver:2009
# Uses the 20H2 release; Other choices: 2004, 1909, 1809
FROM mcr.microsoft.com/windows/nanoserver:20H2
WORKDIR /app
COPY --from=build /app .

2
samples/dotnetapp/README.md
Просмотреть файл

@ -132,7 +132,7 @@ docker images dotnetapp
The `Dockerfile.nanoserver-x64` Dockerfile targets a version-specific tag, which will result in a Nano Server version that targets a specific Windows version (and will only work on Windows hosts of the same version or higher). You can update the following the tag to a different version, as needed.
```console
FROM mcr.microsoft.com/dotnet/runtime:5.0-nanoserver-2009
FROM mcr.microsoft.com/dotnet/runtime:5.0-nanoserver-20H2
```
## Build an image for ARM32 and ARM64

4
samples/selecting-tags.md
Просмотреть файл

@ -47,7 +47,7 @@ The following tags demonstrate the pattern used to describe each operating syste
* `5.0-alpine` (Latest Alpine)
* `5.0-bionic` (Ubuntu 18.04)
* `5.0-buster-slim` (Debian 10)
* `5.0-nanoserver-2009` (Nano Server, version 2009)
* `5.0-nanoserver-20H2` (Nano Server, version 20H2)
* `5.0-nanoserver-2004` (Nano Server, version 2004)
* `5.0-nanoserver-1909` (Nano Server, version 1909)
* `5.0-nanoserver-1809` (Nano Server, version 1809)
@ -70,7 +70,7 @@ The following tags demonstrate the pattern used to describe each processor, usin
* `5.0-alpine-amd64`
* `5.0-bionic-amd64`
* `5.0-buster-slim-amd64`
* `5.0-nanoserver-2009`
* `5.0-nanoserver-20H2`
* `5.0-nanoserver-2004`
* `5.0-nanoserver-1909`
* `5.0-nanoserver-1809`

4
src/aspnet/2.1/nanoserver-2009/amd64/Dockerfile → src/aspnet/2.1/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -1,7 +1,7 @@
# escape=`
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -21,7 +21,7 @@ RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/do
# Runtime image
FROM mcr.microsoft.com/windows/nanoserver:2009-amd64
FROM mcr.microsoft.com/windows/nanoserver:20H2-amd64
# Note: Runtime image's SHELL is the CMD shell (different than the installer image).

4
src/aspnet/3.1/nanoserver-2009/amd64/Dockerfile → src/aspnet/3.1/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -3,7 +3,7 @@
ARG REPO=mcr.microsoft.com/dotnet/runtime
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -22,6 +22,6 @@ RUN $aspnetcore_version = '3.1.10'; `
# Runtime image
FROM $REPO:3.1-nanoserver-2009
FROM $REPO:3.1-nanoserver-20H2
COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"]

4
src/aspnet/5.0/nanoserver-2009/amd64/Dockerfile → src/aspnet/5.0/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime
ARG ASPNET_VERSION=5.0.0
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
ARG ASPNET_VERSION
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -23,7 +23,7 @@ RUN Invoke-WebRequest -OutFile aspnetcore.zip https://dotnetcli.azureedge.net/do
# ASP.NET Core image
FROM $REPO:5.0-nanoserver-2009
FROM $REPO:5.0-nanoserver-20H2
ARG ASPNET_VERSION
ENV ASPNET_VERSION $ASPNET_VERSION

4
src/runtime/2.1/nanoserver-2009/amd64/Dockerfile → src/runtime/2.1/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -1,7 +1,7 @@
# escape=`
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -21,7 +21,7 @@ RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet
# Runtime image
FROM mcr.microsoft.com/windows/nanoserver:2009-amd64
FROM mcr.microsoft.com/windows/nanoserver:20H2-amd64
COPY --from=installer ["/dotnet", "/Program Files/dotnet"]

4
src/runtime/3.1/nanoserver-2009/amd64/Dockerfile → src/runtime/3.1/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -1,7 +1,7 @@
# escape=`
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -20,7 +20,7 @@ RUN $dotnet_version = '3.1.10'; `
# Runtime image
FROM mcr.microsoft.com/windows/nanoserver:2009-amd64
FROM mcr.microsoft.com/windows/nanoserver:20H2-amd64
ENV `
# Configure web servers to bind to port 80 when present

4
src/runtime/5.0/nanoserver-2009/amd64/Dockerfile → src/runtime/5.0/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -3,7 +3,7 @@
ARG DOTNET_VERSION=5.0.0
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
ARG DOTNET_VERSION
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -22,7 +22,7 @@ RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet
# Runtime image
FROM mcr.microsoft.com/windows/nanoserver:2009-amd64
FROM mcr.microsoft.com/windows/nanoserver:20H2-amd64
ARG DOTNET_VERSION
ENV `

4
src/sdk/2.1/nanoserver-2009/amd64/Dockerfile → src/sdk/2.1/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -1,7 +1,7 @@
# escape=`
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -21,7 +21,7 @@ RUN Invoke-WebRequest -OutFile dotnet.zip https://dotnetcli.azureedge.net/dotnet
# SDK image
FROM mcr.microsoft.com/windows/nanoserver:2009-amd64
FROM mcr.microsoft.com/windows/nanoserver:20H2-amd64
COPY --from=installer ["/dotnet", "/Program Files/dotnet"]

6
src/sdk/3.1/nanoserver-2009/amd64/Dockerfile → src/sdk/3.1/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -3,7 +3,7 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -39,7 +39,7 @@ RUN `
Get-ChildItem -Exclude Microsoft.WindowsDesktop.App -Path dotnet\shared | Remove-Item -Force -Recurse
# SDK image
FROM $REPO:3.1-nanoserver-2009
FROM $REPO:3.1-nanoserver-20H2
ENV `
# Unset ASPNETCORE_URLS from aspnet base image
@ -49,7 +49,7 @@ ENV `
# Skip extraction of XML docs - generally not useful within an image/container - helps performance
NUGET_XMLDOC_MODE=skip `
# PowerShell telemetry for docker image usage
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-NanoServer-2009
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-NanoServer-20H2
# In order to set system PATH, ContainerAdministrator must be used
USER ContainerAdministrator

6
src/sdk/5.0/nanoserver-2009/amd64/Dockerfile → src/sdk/5.0/nanoserver-20H2/amd64/Dockerfile
Просмотреть файл

@ -4,7 +4,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
ARG DOTNET_SDK_VERSION=5.0.100
# Installer image
FROM mcr.microsoft.com/windows/servercore:2009-amd64 AS installer
FROM mcr.microsoft.com/windows/servercore:20H2-amd64 AS installer
ARG DOTNET_SDK_VERSION
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@ -40,7 +40,7 @@ RUN `
Get-ChildItem -Exclude Microsoft.WindowsDesktop.App -Path dotnet\shared | Remove-Item -Force -Recurse
# SDK image
FROM $REPO:5.0-nanoserver-2009
FROM $REPO:5.0-nanoserver-20H2
ARG DOTNET_SDK_VERSION
ENV `
@ -52,7 +52,7 @@ ENV `
# Skip extraction of XML docs - generally not useful within an image/container - helps performance
NUGET_XMLDOC_MODE=skip `
# PowerShell telemetry for docker image usage
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-2009
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-20H2
# In order to set system PATH, ContainerAdministrator must be used
USER ContainerAdministrator

2
tests/Microsoft.DotNet.Docker.Tests/OS.cs
Просмотреть файл

@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Docker.Tests
public const string NanoServer1903 = "nanoserver-1903";
public const string NanoServer1909 = "nanoserver-1909";
public const string NanoServer2004 = "nanoserver-2004";
public const string NanoServer2009 = "nanoserver-2009";
public const string NanoServer20H2 = "nanoserver-20H2";
public const string ServerCoreLtsc2019 = "windowsservercore-ltsc2019";
// Helpers

12
tests/Microsoft.DotNet.Docker.Tests/TestData.cs
Просмотреть файл

@ -47,16 +47,16 @@ namespace Microsoft.DotNet.Docker.Tests
new ProductImageData { Version = V2_1, OS = OS.NanoServer1903, Arch = Arch.Amd64 },
new ProductImageData { Version = V2_1, OS = OS.NanoServer1909, Arch = Arch.Amd64 },
new ProductImageData { Version = V2_1, OS = OS.NanoServer2004, Arch = Arch.Amd64 },
new ProductImageData { Version = V2_1, OS = OS.NanoServer2009, Arch = Arch.Amd64 },
new ProductImageData { Version = V2_1, OS = OS.NanoServer20H2, Arch = Arch.Amd64 },
new ProductImageData { Version = V3_1, OS = OS.NanoServer1809, Arch = Arch.Amd64 },
new ProductImageData { Version = V3_1, OS = OS.NanoServer1903, Arch = Arch.Amd64 },
new ProductImageData { Version = V3_1, OS = OS.NanoServer1909, Arch = Arch.Amd64 },
new ProductImageData { Version = V3_1, OS = OS.NanoServer2004, Arch = Arch.Amd64 },
new ProductImageData { Version = V3_1, OS = OS.NanoServer2009, Arch = Arch.Amd64 },
new ProductImageData { Version = V3_1, OS = OS.NanoServer20H2, Arch = Arch.Amd64 },
new ProductImageData { Version = V5_0, OS = OS.NanoServer1809, Arch = Arch.Amd64 },
new ProductImageData { Version = V5_0, OS = OS.NanoServer1909, Arch = Arch.Amd64 },
new ProductImageData { Version = V5_0, OS = OS.NanoServer2004, Arch = Arch.Amd64 },
new ProductImageData { Version = V5_0, OS = OS.NanoServer2009, Arch = Arch.Amd64 },
new ProductImageData { Version = V5_0, OS = OS.NanoServer20H2, Arch = Arch.Amd64 },
new ProductImageData { Version = V5_0, OS = OS.ServerCoreLtsc2019, Arch = Arch.Amd64 },
};
@ -84,10 +84,10 @@ namespace Microsoft.DotNet.Docker.Tests
new SampleImageData { OS = OS.NanoServer1809, Arch = Arch.Amd64, IsPublished = true },
new SampleImageData { OS = OS.NanoServer1909, Arch = Arch.Amd64, IsPublished = true },
new SampleImageData { OS = OS.NanoServer2004, Arch = Arch.Amd64, IsPublished = true },
new SampleImageData { OS = OS.NanoServer2009, Arch = Arch.Amd64, IsPublished = true },
new SampleImageData { OS = OS.NanoServer20H2, Arch = Arch.Amd64, IsPublished = true },
new SampleImageData { OS = OS.NanoServer2009, Arch = Arch.Amd64, DockerfileSuffix = "nanoserver-x64" },
new SampleImageData { OS = OS.NanoServer2009, Arch = Arch.Amd64, DockerfileSuffix = "nanoserver-x64-slim" },
new SampleImageData { OS = OS.NanoServer20H2, Arch = Arch.Amd64, DockerfileSuffix = "nanoserver-x64" },
new SampleImageData { OS = OS.NanoServer20H2, Arch = Arch.Amd64, DockerfileSuffix = "nanoserver-x64-slim" },
};
public static IEnumerable<ProductImageData> GetImageData()

18
tests/performance/ImageSize.nightly.windows.json
Просмотреть файл

@ -4,16 +4,16 @@
"src/runtime/2.1/nanoserver-1903/amd64": 326367498,
"src/runtime/2.1/nanoserver-1909/amd64": 327609836,
"src/runtime/2.1/nanoserver-2004/amd64": 332625363,
"src/runtime/2.1/nanoserver-2009/amd64": 332595568,
"src/runtime/2.1/nanoserver-20H2/amd64": 332595568,
"src/runtime/3.1/nanoserver-1809/amd64": 321408734,
"src/runtime/3.1/nanoserver-1903/amd64": 326438075,
"src/runtime/3.1/nanoserver-1909/amd64": 328083762,
"src/runtime/3.1/nanoserver-2004/amd64": 333119873,
"src/runtime/3.1/nanoserver-2009/amd64": 333111462,
"src/runtime/3.1/nanoserver-20H2/amd64": 333111462,
"src/runtime/5.0/nanoserver-1809/amd64": 321408734,
"src/runtime/5.0/nanoserver-1909/amd64": 328083762,
"src/runtime/5.0/nanoserver-2004/amd64": 332279013,
"src/runtime/5.0/nanoserver-2009/amd64": 331997328,
"src/runtime/5.0/nanoserver-20H2/amd64": 331997328,
"src/runtime/5.0/windowsservercore-ltsc2019/amd64": 5179432868
},
"dotnet/nightly/aspnet": {
@ -21,16 +21,16 @@
"src/aspnet/2.1/nanoserver-1903/amd64": 399947583,
"src/aspnet/2.1/nanoserver-1909/amd64": 401265767,
"src/aspnet/2.1/nanoserver-2004/amd64": 406353173,
"src/aspnet/2.1/nanoserver-2009/amd64": 406329642,
"src/aspnet/2.1/nanoserver-20H2/amd64": 406329642,
"src/aspnet/3.1/nanoserver-1809/amd64": 341072949,
"src/aspnet/3.1/nanoserver-1903/amd64": 346102290,
"src/aspnet/3.1/nanoserver-1909/amd64": 347747977,
"src/aspnet/3.1/nanoserver-2004/amd64": 352805234,
"src/aspnet/3.1/nanoserver-2009/amd64": 352830735,
"src/aspnet/3.1/nanoserver-20H2/amd64": 352830735,
"src/aspnet/5.0/nanoserver-1809/amd64": 341072949,
"src/aspnet/5.0/nanoserver-1909/amd64": 347747977,
"src/aspnet/5.0/nanoserver-2004/amd64": 352472752,
"src/aspnet/5.0/nanoserver-2009/amd64": 352935076,
"src/aspnet/5.0/nanoserver-20H2/amd64": 352935076,
"src/aspnet/5.0/windowsservercore-ltsc2019/amd64": 5230505064
},
"dotnet/nightly/sdk": {
@ -38,16 +38,16 @@
"src/sdk/2.1/nanoserver-1903/amd64": 1666573518,
"src/sdk/2.1/nanoserver-1909/amd64": 1672306130,
"src/sdk/2.1/nanoserver-2004/amd64": 1675836982,
"src/sdk/2.1/nanoserver-2009/amd64": 1676253338,
"src/sdk/2.1/nanoserver-20H2/amd64": 1676253338,
"src/sdk/3.1/nanoserver-1809/amd64": 730951559,
"src/sdk/3.1/nanoserver-1903/amd64": 735894844,
"src/sdk/3.1/nanoserver-1909/amd64": 737661435,
"src/sdk/3.1/nanoserver-2004/amd64": 759552332,
"src/sdk/3.1/nanoserver-2009/amd64": 764063867,
"src/sdk/3.1/nanoserver-20H2/amd64": 764063867,
"src/sdk/5.0/nanoserver-1809/amd64": 782722955,
"src/sdk/5.0/nanoserver-1909/amd64": 789170333,
"src/sdk/5.0/nanoserver-2004/amd64": 820353958,
"src/sdk/5.0/nanoserver-2009/amd64": 832507988,
"src/sdk/5.0/nanoserver-20H2/amd64": 832507988,
"src/sdk/5.0/windowsservercore-ltsc2019/amd64": 5746263526
}
}