Skip to content

Commit cedb3af

Browse files
lbusselllbussell
authored
Update sample images to 4.8.1 (#1266)
1 parent 41f77cb commit cedb3af

File tree

12 files changed

+21
-103
lines changed

12 files changed

+21
-103
lines changed

‎.portal-docs/docker-hub/README.samples.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ View the current tags at the [Microsoft Artifact Registry portal](https://mcr.mi
7979

8080
# Support
8181

82+
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.
83+
8284
## Lifecycle
8385

8486
* [.NET Framework Lifecycle FAQ](https://support.microsoft.com/help/17455/lifecycle-faq-net-framework)

‎.portal-docs/mar/README.samples.portal.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ docker run --name wcfclient_sample --rm -it -e HOST=172.26.236.119 mcr.microsoft
7575

7676
## Support
7777

78+
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.
79+
7880
### Lifecycle
7981

8082
* [.NET Framework Lifecycle FAQ](https://support.microsoft.com/help/17455/lifecycle-faq-net-framework)

‎README.samples.md‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,15 @@ dotnetapp-windowsservercore-ltsc2022, dotnetapp, latest | [Dockerfile](samples/d
8585
aspnetapp-windowsservercore-ltsc2022, aspnetapp | [Dockerfile](samples/aspnetapp/Dockerfile)
8686
wcfservice-windowsservercore-ltsc2022, wcfservice | [Dockerfile](samples/wcfapp/Dockerfile.web)
8787
wcfclient-windowsservercore-ltsc2022, wcfclient | [Dockerfile](samples/wcfapp/Dockerfile.client)
88-
89-
### Windows Server Core 2019 amd64 Tags
90-
91-
Tag | Dockerfile
92-
---------| ---------------
93-
dotnetapp-windowsservercore-ltsc2019, dotnetapp, latest | [Dockerfile](samples/dotnetapp/Dockerfile)
94-
aspnetapp-windowsservercore-ltsc2019, aspnetapp | [Dockerfile](samples/aspnetapp/Dockerfile)
95-
wcfservice-windowsservercore-ltsc2019, wcfservice | [Dockerfile](samples/wcfapp/Dockerfile.web)
96-
wcfclient-windowsservercore-ltsc2019, wcfclient | [Dockerfile](samples/wcfapp/Dockerfile.client)
97-
98-
### Windows Server Core 2016 amd64 Tags
99-
100-
Tag | Dockerfile
101-
---------| ---------------
102-
dotnetapp-windowsservercore-ltsc2016, dotnetapp, latest | [Dockerfile](samples/dotnetapp/Dockerfile)
103-
aspnetapp-windowsservercore-ltsc2016, aspnetapp | [Dockerfile](samples/aspnetapp/Dockerfile)
104-
wcfservice-windowsservercore-ltsc2016, wcfservice | [Dockerfile](samples/wcfapp/Dockerfile.web)
105-
wcfclient-windowsservercore-ltsc2016, wcfclient | [Dockerfile](samples/wcfapp/Dockerfile.client)
10688
<!--End of generated tags-->
10789

10890
*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).
10991
See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/framework/samples/tags/list) for all supported and unsupported tags.*
11092

11193
## Support
11294

95+
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.
96+
11397
### Lifecycle
11498

11599
* [.NET Framework Lifecycle FAQ](https://support.microsoft.com/help/17455/lifecycle-faq-net-framework)

‎eng/mcr-tags-metadata-templates/samples-tags.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,3 @@ $(McrTagsYmlTagGroup:dotnetapp-windowsservercore-ltsc2022)
33
$(McrTagsYmlTagGroup:aspnetapp-windowsservercore-ltsc2022)
44
$(McrTagsYmlTagGroup:wcfservice-windowsservercore-ltsc2022)
55
$(McrTagsYmlTagGroup:wcfclient-windowsservercore-ltsc2022)
6-
$(McrTagsYmlTagGroup:dotnetapp-windowsservercore-ltsc2019)
7-
$(McrTagsYmlTagGroup:aspnetapp-windowsservercore-ltsc2019)
8-
$(McrTagsYmlTagGroup:wcfservice-windowsservercore-ltsc2019)
9-
$(McrTagsYmlTagGroup:wcfclient-windowsservercore-ltsc2019)
10-
$(McrTagsYmlTagGroup:dotnetapp-windowsservercore-ltsc2016)
11-
$(McrTagsYmlTagGroup:aspnetapp-windowsservercore-ltsc2016)
12-
$(McrTagsYmlTagGroup:wcfservice-windowsservercore-ltsc2016)
13-
$(McrTagsYmlTagGroup:wcfclient-windowsservercore-ltsc2016)

‎eng/readme-templates/Support.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{ARGS["top-header"]}} Support
22

3-
{{ARGS["top-header"]}}# Lifecycle
3+
{{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.
4+
5+
}}{{ARGS["top-header"]}}# Lifecycle
46

57
* [.NET Framework Lifecycle FAQ](https://support.microsoft.com/help/17455/lifecycle-faq-net-framework)
68
* [Supported Tags Policy](https://github.com/microsoft/dotnet-framework-docker/blob/main/documentation/supported-tags.md)

‎manifest.samples.json‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,6 @@
2626
"latest": {}
2727
},
2828
"platforms": [
29-
{
30-
"dockerfile": "samples/dotnetapp",
31-
"os": "windows",
32-
"osVersion": "windowsservercore-ltsc2016",
33-
"tags": {
34-
"dotnetapp-windowsservercore-ltsc2016": {}
35-
}
36-
},
37-
{
38-
"dockerfile": "samples/dotnetapp",
39-
"os": "windows",
40-
"osVersion": "windowsservercore-ltsc2019",
41-
"tags": {
42-
"dotnetapp-windowsservercore-ltsc2019": {}
43-
}
44-
},
4529
{
4630
"dockerfile": "samples/dotnetapp",
4731
"os": "windows",
@@ -57,22 +41,6 @@
5741
"aspnetapp": {}
5842
},
5943
"platforms": [
60-
{
61-
"dockerfile": "samples/aspnetapp",
62-
"os": "windows",
63-
"osVersion": "windowsservercore-ltsc2016",
64-
"tags": {
65-
"aspnetapp-windowsservercore-ltsc2016": {}
66-
}
67-
},
68-
{
69-
"dockerfile": "samples/aspnetapp",
70-
"os": "windows",
71-
"osVersion": "windowsservercore-ltsc2019",
72-
"tags": {
73-
"aspnetapp-windowsservercore-ltsc2019": {}
74-
}
75-
},
7644
{
7745
"dockerfile": "samples/aspnetapp",
7846
"os": "windows",
@@ -88,22 +56,6 @@
8856
"wcfservice":{}
8957
},
9058
"platforms": [
91-
{
92-
"dockerfile": "samples/wcfapp/Dockerfile.web",
93-
"os": "windows",
94-
"osVersion": "windowsservercore-ltsc2016",
95-
"tags": {
96-
"wcfservice-windowsservercore-ltsc2016": {}
97-
}
98-
},
99-
{
100-
"dockerfile": "samples/wcfapp/Dockerfile.web",
101-
"os": "windows",
102-
"osVersion": "windowsservercore-ltsc2019",
103-
"tags": {
104-
"wcfservice-windowsservercore-ltsc2019": {}
105-
}
106-
},
10759
{
10860
"dockerfile": "samples/wcfapp/Dockerfile.web",
10961
"os": "windows",
@@ -119,22 +71,6 @@
11971
"wcfclient":{}
12072
},
12173
"platforms": [
122-
{
123-
"dockerfile": "samples/wcfapp/Dockerfile.client",
124-
"os": "windows",
125-
"osVersion": "windowsservercore-ltsc2016",
126-
"tags": {
127-
"wcfclient-windowsservercore-ltsc2016": {}
128-
}
129-
},
130-
{
131-
"dockerfile": "samples/wcfapp/Dockerfile.client",
132-
"os": "windows",
133-
"osVersion": "windowsservercore-ltsc2019",
134-
"tags": {
135-
"wcfclient-windowsservercore-ltsc2019": {}
136-
}
137-
},
13874
{
13975
"dockerfile": "samples/wcfapp/Dockerfile.client",
14076
"os": "windows",

‎samples/aspnetapp/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build
1+
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build
22
WORKDIR /app
33

44
# copy csproj and restore as distinct layers
@@ -13,6 +13,6 @@ WORKDIR /app/aspnetapp
1313
RUN msbuild /p:Configuration=Release -r:False
1414

1515

16-
FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8 AS runtime
16+
FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8.1 AS runtime
1717
WORKDIR /inetpub/wwwroot
1818
COPY --from=build /app/aspnetapp/. ./

‎samples/aspnetmvcapp/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build
1+
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build
22
WORKDIR /app
33

44
# copy csproj and restore as distinct layers
@@ -13,6 +13,6 @@ WORKDIR /app/aspnetmvcapp
1313
RUN msbuild /p:Configuration=Release -r:False
1414

1515

16-
FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8 AS runtime
16+
FROM mcr.microsoft.com/dotnet/framework/aspnet:4.8.1 AS runtime
1717
WORKDIR /inetpub/wwwroot
1818
COPY --from=build /app/aspnetmvcapp/. ./

‎samples/dotnetapp/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build
1+
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build
22
WORKDIR /app
33

44
# copy csproj and restore as distinct layers
@@ -11,7 +11,7 @@ WORKDIR /app
1111
RUN dotnet publish -c Release -o out --no-restore
1212

1313

14-
FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime
14+
FROM mcr.microsoft.com/dotnet/framework/runtime:4.8.1 AS runtime
1515
WORKDIR /app
1616
COPY --from=build /app/out ./
1717
ENTRYPOINT ["dotnetapp.exe"]

‎samples/wcfapp/Dockerfile.client‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8 AS build
1+
FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1 AS build
22
WORKDIR /app
33
COPY WcfClient/. .
44
RUN msbuild /p:Configuration=Release
55

6-
FROM mcr.microsoft.com/dotnet/framework/runtime:4.8 AS runtime
6+
FROM mcr.microsoft.com/dotnet/framework/runtime:4.8.1 AS runtime
77
WORKDIR /app
88
COPY --from=build /app/bin/Release .
99
ENTRYPOINT WcfClient.exe

0 commit comments

Comments
 (0)