Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions README.samples.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
<!--End of generated tags-->

*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).
Expand Down
8 changes: 0 additions & 8 deletions eng/mcr-tags-metadata-templates/samples-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
64 changes: 0 additions & 64 deletions manifest.samples.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions samples/aspnetapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/. ./
4 changes: 2 additions & 2 deletions samples/aspnetmvcapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/. ./
4 changes: 2 additions & 2 deletions samples/dotnetapp/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]
4 changes: 2 additions & 2 deletions samples/wcfapp/Dockerfile.client
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions samples/wcfapp/Dockerfile.console
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions samples/wcfapp/Dockerfile.web
Original file line number Diff line number Diff line change
@@ -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/ .