diff --git a/.portal-docs/docker-hub/README.samples.md b/.portal-docs/docker-hub/README.samples.md index 36be24a2..c304ec12 100644 --- a/.portal-docs/docker-hub/README.samples.md +++ b/.portal-docs/docker-hub/README.samples.md @@ -79,6 +79,8 @@ View the current tags at the [Microsoft Artifact Registry portal](https://mcr.mi # Support +These sample images are not intended for production use and may be subject to breaking changes or removal at any time. They are provided as a starting point for developers to experiment with and learn about .NET Framework in a containerized environment. + ## Lifecycle * [.NET Framework Lifecycle FAQ](https://support.microsoft.com/help/17455/lifecycle-faq-net-framework) diff --git a/.portal-docs/mar/README.samples.portal.md b/.portal-docs/mar/README.samples.portal.md index c0a87ef5..7020631a 100644 --- a/.portal-docs/mar/README.samples.portal.md +++ b/.portal-docs/mar/README.samples.portal.md @@ -75,6 +75,8 @@ docker run --name wcfclient_sample --rm -it -e HOST=172.26.236.119 mcr.microsoft ## Support +These sample images are not intended for production use and may be subject to breaking changes or removal at any time. They are provided as a starting point for developers to experiment with and learn about .NET Framework in a containerized environment. + ### Lifecycle * [.NET Framework Lifecycle FAQ](https://support.microsoft.com/help/17455/lifecycle-faq-net-framework) diff --git a/README.samples.md b/README.samples.md index cf62fb89..0b496c96 100644 --- a/README.samples.md +++ b/README.samples.md @@ -85,24 +85,6 @@ dotnetapp-windowsservercore-ltsc2022, dotnetapp, latest | [Dockerfile](samples/d aspnetapp-windowsservercore-ltsc2022, aspnetapp | [Dockerfile](samples/aspnetapp/Dockerfile) wcfservice-windowsservercore-ltsc2022, wcfservice | [Dockerfile](samples/wcfapp/Dockerfile.web) wcfclient-windowsservercore-ltsc2022, wcfclient | [Dockerfile](samples/wcfapp/Dockerfile.client) - -### Windows Server Core 2019 amd64 Tags - -Tag | Dockerfile ----------| --------------- -dotnetapp-windowsservercore-ltsc2019, dotnetapp, latest | [Dockerfile](samples/dotnetapp/Dockerfile) -aspnetapp-windowsservercore-ltsc2019, aspnetapp | [Dockerfile](samples/aspnetapp/Dockerfile) -wcfservice-windowsservercore-ltsc2019, wcfservice | [Dockerfile](samples/wcfapp/Dockerfile.web) -wcfclient-windowsservercore-ltsc2019, wcfclient | [Dockerfile](samples/wcfapp/Dockerfile.client) - -### Windows Server Core 2016 amd64 Tags - -Tag | Dockerfile ----------| --------------- -dotnetapp-windowsservercore-ltsc2016, dotnetapp, latest | [Dockerfile](samples/dotnetapp/Dockerfile) -aspnetapp-windowsservercore-ltsc2016, aspnetapp | [Dockerfile](samples/aspnetapp/Dockerfile) -wcfservice-windowsservercore-ltsc2016, wcfservice | [Dockerfile](samples/wcfapp/Dockerfile.web) -wcfclient-windowsservercore-ltsc2016, wcfclient | [Dockerfile](samples/wcfapp/Dockerfile.client) *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). @@ -110,6 +92,8 @@ See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/framework/sample ## Support +These sample images are not intended for production use and may be subject to breaking changes or removal at any time. They are provided as a starting point for developers to experiment with and learn about .NET Framework in a containerized environment. + ### Lifecycle * [.NET Framework Lifecycle FAQ](https://support.microsoft.com/help/17455/lifecycle-faq-net-framework) diff --git a/eng/mcr-tags-metadata-templates/samples-tags.yml b/eng/mcr-tags-metadata-templates/samples-tags.yml index 4b42a38d..b64a5921 100644 --- a/eng/mcr-tags-metadata-templates/samples-tags.yml +++ b/eng/mcr-tags-metadata-templates/samples-tags.yml @@ -3,11 +3,3 @@ $(McrTagsYmlTagGroup:dotnetapp-windowsservercore-ltsc2022) $(McrTagsYmlTagGroup:aspnetapp-windowsservercore-ltsc2022) $(McrTagsYmlTagGroup:wcfservice-windowsservercore-ltsc2022) $(McrTagsYmlTagGroup:wcfclient-windowsservercore-ltsc2022) -$(McrTagsYmlTagGroup:dotnetapp-windowsservercore-ltsc2019) -$(McrTagsYmlTagGroup:aspnetapp-windowsservercore-ltsc2019) -$(McrTagsYmlTagGroup:wcfservice-windowsservercore-ltsc2019) -$(McrTagsYmlTagGroup:wcfclient-windowsservercore-ltsc2019) -$(McrTagsYmlTagGroup:dotnetapp-windowsservercore-ltsc2016) -$(McrTagsYmlTagGroup:aspnetapp-windowsservercore-ltsc2016) -$(McrTagsYmlTagGroup:wcfservice-windowsservercore-ltsc2016) -$(McrTagsYmlTagGroup:wcfclient-windowsservercore-ltsc2016) diff --git a/eng/readme-templates/Support.md b/eng/readme-templates/Support.md index f55123f1..a8ef60ba 100644 --- a/eng/readme-templates/Support.md +++ b/eng/readme-templates/Support.md @@ -1,6 +1,8 @@ {{ARGS["top-header"]}} Support -{{ARGS["top-header"]}}# Lifecycle +{{if match(SHORT_REPO, "samples"):These sample images are not intended for production use and may be subject to breaking changes or removal at any time. They are provided as a starting point for developers to experiment with and learn about .NET Framework in a containerized environment. + +}}{{ARGS["top-header"]}}# Lifecycle * [.NET Framework Lifecycle FAQ](https://support.microsoft.com/help/17455/lifecycle-faq-net-framework) * [Supported Tags Policy](https://github.com/microsoft/dotnet-framework-docker/blob/main/documentation/supported-tags.md) diff --git a/manifest.samples.json b/manifest.samples.json index 304c3759..c0ae707a 100644 --- a/manifest.samples.json +++ b/manifest.samples.json @@ -26,22 +26,6 @@ "latest": {} }, "platforms": [ - { - "dockerfile": "samples/dotnetapp", - "os": "windows", - "osVersion": "windowsservercore-ltsc2016", - "tags": { - "dotnetapp-windowsservercore-ltsc2016": {} - } - }, - { - "dockerfile": "samples/dotnetapp", - "os": "windows", - "osVersion": "windowsservercore-ltsc2019", - "tags": { - "dotnetapp-windowsservercore-ltsc2019": {} - } - }, { "dockerfile": "samples/dotnetapp", "os": "windows", @@ -57,22 +41,6 @@ "aspnetapp": {} }, "platforms": [ - { - "dockerfile": "samples/aspnetapp", - "os": "windows", - "osVersion": "windowsservercore-ltsc2016", - "tags": { - "aspnetapp-windowsservercore-ltsc2016": {} - } - }, - { - "dockerfile": "samples/aspnetapp", - "os": "windows", - "osVersion": "windowsservercore-ltsc2019", - "tags": { - "aspnetapp-windowsservercore-ltsc2019": {} - } - }, { "dockerfile": "samples/aspnetapp", "os": "windows", @@ -88,22 +56,6 @@ "wcfservice":{} }, "platforms": [ - { - "dockerfile": "samples/wcfapp/Dockerfile.web", - "os": "windows", - "osVersion": "windowsservercore-ltsc2016", - "tags": { - "wcfservice-windowsservercore-ltsc2016": {} - } - }, - { - "dockerfile": "samples/wcfapp/Dockerfile.web", - "os": "windows", - "osVersion": "windowsservercore-ltsc2019", - "tags": { - "wcfservice-windowsservercore-ltsc2019": {} - } - }, { "dockerfile": "samples/wcfapp/Dockerfile.web", "os": "windows", @@ -119,22 +71,6 @@ "wcfclient":{} }, "platforms": [ - { - "dockerfile": "samples/wcfapp/Dockerfile.client", - "os": "windows", - "osVersion": "windowsservercore-ltsc2016", - "tags": { - "wcfclient-windowsservercore-ltsc2016": {} - } - }, - { - "dockerfile": "samples/wcfapp/Dockerfile.client", - "os": "windows", - "osVersion": "windowsservercore-ltsc2019", - "tags": { - "wcfclient-windowsservercore-ltsc2019": {} - } - }, { "dockerfile": "samples/wcfapp/Dockerfile.client", "os": "windows", diff --git a/samples/aspnetapp/Dockerfile b/samples/aspnetapp/Dockerfile index 926590af..1ccf413e 100644 --- a/samples/aspnetapp/Dockerfile +++ b/samples/aspnetapp/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app # copy csproj and restore as distinct layers @@ -13,6 +13,6 @@ WORKDIR /app/aspnetapp RUN msbuild /p:Configuration=Release -r:False -FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8 AS runtime +FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8.1 AS runtime WORKDIR /inetpub/wwwroot COPY --from=build /app/aspnetapp/. ./ diff --git a/samples/aspnetmvcapp/Dockerfile b/samples/aspnetmvcapp/Dockerfile index 0645bd82..57801b16 100644 --- a/samples/aspnetmvcapp/Dockerfile +++ b/samples/aspnetmvcapp/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app # copy csproj and restore as distinct layers @@ -13,6 +13,6 @@ WORKDIR /app/aspnetmvcapp RUN msbuild /p:Configuration=Release -r:False -FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8 AS runtime +FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8.1 AS runtime WORKDIR /inetpub/wwwroot COPY --from=build /app/aspnetmvcapp/. ./ diff --git a/samples/dotnetapp/Dockerfile b/samples/dotnetapp/Dockerfile index a38d11a2..55872994 100644 --- a/samples/dotnetapp/Dockerfile +++ b/samples/dotnetapp/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app # copy csproj and restore as distinct layers @@ -11,7 +11,7 @@ WORKDIR /app RUN dotnet publish -c Release -o out --no-restore -FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime +FROM mcr.microsoft.com/dotnet/framework/runtime:4.8.1 AS runtime WORKDIR /app COPY --from=build /app/out ./ ENTRYPOINT ["dotnetapp.exe"] diff --git a/samples/wcfapp/Dockerfile.client b/samples/wcfapp/Dockerfile.client index 76767319..8f92ddb7 100644 --- a/samples/wcfapp/Dockerfile.client +++ b/samples/wcfapp/Dockerfile.client @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app COPY WcfClient/. . RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime +FROM mcr.microsoft.com/dotnet/framework/runtime:4.8.1 AS runtime WORKDIR /app COPY --from=build /app/bin/Release . ENTRYPOINT WcfClient.exe diff --git a/samples/wcfapp/Dockerfile.console b/samples/wcfapp/Dockerfile.console index 413f8c55..83e7da55 100644 --- a/samples/wcfapp/Dockerfile.console +++ b/samples/wcfapp/Dockerfile.console @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app COPY WcfServiceConsoleApp/. . RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime +FROM mcr.microsoft.com/dotnet/framework/runtime:4.8.1 AS runtime EXPOSE 80 EXPOSE 808 WORKDIR /app diff --git a/samples/wcfapp/Dockerfile.web b/samples/wcfapp/Dockerfile.web index ed8d931a..bd000edc 100644 --- a/samples/wcfapp/Dockerfile.web +++ b/samples/wcfapp/Dockerfile.web @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build WORKDIR /app COPY WcfServiceWebApp/. . RUN msbuild /p:Configuration=Release -FROM mcr.microsoft.com/dotnet/framework/wcf:4.8 AS runtime +FROM mcr.microsoft.com/dotnet/framework/wcf:4.8.1 AS runtime WORKDIR /inetpub/wwwroot COPY --from=build /app/ .