Update samples to .NET 8 #4742
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| $(McrTagsYmlRepo:samples) | ||
| $(McrTagsYmlTagGroup:dotnetapp-jammy-chiseled-amd64) | ||
| $(McrTagsYmlTagGroup:aspnetapp-jammy-chiseled-composite-amd64) | ||
| $(McrTagsYmlTagGroup:dotnetapp-jammy-chiseled-arm32v7) | ||
| $(McrTagsYmlTagGroup:aspnetapp-jammy-chiseled-composite-arm32v7) | ||
| $(McrTagsYmlTagGroup:dotnetapp-jammy-chiseled-arm64v8) | ||
| $(McrTagsYmlTagGroup:aspnetapp-jammy-chiseled-composite-arm64v8) | ||
| $(McrTagsYmlTagGroup:dotnetapp-nanoserver-ltsc2022) | ||
| $(McrTagsYmlTagGroup:aspnetapp-nanoserver-ltsc2022) | ||
| $(McrTagsYmlTagGroup:dotnetapp-nanoserver-1809) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,35 +31,38 @@ | |
| }, | ||
| "platforms": [ | ||
| { | ||
| "dockerfile": "samples/dotnetapp/Dockerfile.chiseled", | ||
| "os": "linux", | ||
| "osVersion": "ubuntu", | ||
| "tags": { | ||
| "dotnetapp-jammy-chiseled-amd64": {} | ||
| } | ||
| }, | ||
| { | ||
| "architecture": "arm", | ||
| "dockerfile": "samples/dotnetapp/Dockerfile.chiseled", | ||
| "os": "linux", | ||
| "osVersion": "ubuntu", | ||
| "tags": { | ||
| "dotnetapp-jammy-chiseled-arm32v7": {} | ||
| }, | ||
| "variant": "v7" | ||
| }, | ||
| { | ||
| "architecture": "arm64", | ||
| "dockerfile": "samples/dotnetapp/Dockerfile.chiseled", | ||
| "os": "linux", | ||
| "osVersion": "ubuntu", | ||
| "tags": { | ||
| "dotnetapp-jammy-chiseled-arm64v8": {} | ||
| }, | ||
| "variant": "v8" | ||
| }, | ||
| { | ||
| "buildArgs": { | ||
| "TAG": "1809" | ||
| }, | ||
| "dockerfile": "samples/dotnetapp/Dockerfile.nanoserver", | ||
| "os": "windows", | ||
| "osVersion": "nanoserver-1809", | ||
| "tags": { | ||
|
|
@@ -71,7 +74,10 @@ | |
| } | ||
| }, | ||
| { | ||
| "buildArgs": { | ||
| "TAG": "ltsc2022" | ||
| }, | ||
| "dockerfile": "samples/dotnetapp/Dockerfile.nanoserver", | ||
| "os": "windows", | ||
| "osVersion": "nanoserver-ltsc2022", | ||
| "tags": { | ||
|
|
@@ -90,56 +96,56 @@ | |
| }, | ||
| "platforms": [ | ||
| { | ||
| "dockerfile": "samples/aspnetapp/Dockerfile.chiseled", | ||
| "os": "linux", | ||
| "osVersion": "ubuntu", | ||
| "tags": { | ||
| "aspnetapp-jammy-chiseled-composite-amd64": {} | ||
| }, | ||
| "customBuildLegGroups": [ | ||
| { | ||
| "name": "test-dependencies", | ||
| "type": "Integral", | ||
| "dependencies": [ | ||
| "$(Repo:samples):dotnetapp-jammy-chiseled-amd64" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "architecture": "arm", | ||
| "dockerfile": "samples/aspnetapp/Dockerfile.chiseled-composite", | ||
| "os": "linux", | ||
| "osVersion": "ubuntu", | ||
| "tags": { | ||
| "aspnetapp-jammy-chiseled-composite-arm32v7": {} | ||
| }, | ||
| "variant": "v7", | ||
| "customBuildLegGroups": [ | ||
| { | ||
| "name": "test-dependencies", | ||
| "type": "Integral", | ||
| "dependencies": [ | ||
| "$(Repo:samples):dotnetapp-jammy-chiseled-arm32v7" | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "architecture": "arm64", | ||
| "dockerfile": "samples/aspnetapp/Dockerfile.chiseled-composite", | ||
| "os": "linux", | ||
| "osVersion": "ubuntu", | ||
| "tags": { | ||
| "aspnetapp-jammy-chiseled-composite-arm64v8": {} | ||
| }, | ||
| "variant": "v8", | ||
| "customBuildLegGroups": [ | ||
| { | ||
| "name": "test-dependencies", | ||
| "type": "Integral", | ||
| "dependencies": [ | ||
| "$(Repo:samples):dotnetapp-jammy-chiseled-arm64v8" | ||
| ] | ||
| } | ||
| ] | ||
|
|
@@ -148,7 +154,7 @@ | |
| "buildArgs": { | ||
| "TAG": "1809" | ||
| }, | ||
| "dockerfile": "samples/aspnetapp/Dockerfile.nanoserver", | ||
| "os": "windows", | ||
| "osVersion": "nanoserver-1809", | ||
| "tags": { | ||
|
|
@@ -172,7 +178,7 @@ | |
| "buildArgs": { | ||
| "TAG": "ltsc2022" | ||
| }, | ||
| "dockerfile": "samples/aspnetapp/Dockerfile.nanoserver", | ||
| "os": "windows", | ||
| "osVersion": "nanoserver-ltsc2022", | ||
| "tags": { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,8 @@ Kubernetes samples are provided in the [kubernetes](kubernetes/README.md) direct | |
|
|
||
| * [Build a .NET container image](dotnetapp/README.md) | ||
| * [Build an ASP.NET Core container image](aspnetapp/README.md) | ||
| * [Build a single file app](releasesapp-singlefile/README.md) | ||
| * [Build a Native AOT app](releasesapi-aot/README.md) | ||
| * [Building a globalization and time zone aware (or unaware) image](globalapp/README.md) | ||
| * [Build for a platform](build-for-a-platform.md) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,21 @@ | ||
| # Learn about building .NET container images: | ||
| # https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md | ||
| FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-preview AS build | ||
|
||
| ARG TARGETARCH | ||
| WORKDIR /source | ||
|
|
||
| # copy csproj and restore as distinct layers | ||
| COPY aspnetapp/*.csproj . | ||
| RUN dotnet restore -a $TARGETARCH | ||
|
|
||
| # copy and publish app and libraries | ||
| COPY aspnetapp/. . | ||
| RUN dotnet publish -a $TARGETARCH --no-restore -o /app | ||
|
|
||
|
|
||
| # final stage/image | ||
| FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview | ||
| WORKDIR /app | ||
| COPY --from=build /app . | ||
| USER $APP_UID | ||
| ENTRYPOINT ["./aspnetapp"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,23 @@ | ||
| # Learn about building .NET container images: | ||
| # https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md | ||
| FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-preview-alpine AS build | ||
| ARG TARGETARCH | ||
| WORKDIR /source | ||
|
|
||
| # copy csproj and restore as distinct layers | ||
| COPY aspnetapp/*.csproj . | ||
| RUN dotnet restore -a $TARGETARCH | ||
|
|
||
| # copy and publish app and libraries | ||
| COPY aspnetapp/. . | ||
| RUN dotnet publish -a $TARGETARCH --no-restore -o /app | ||
|
|
||
|
|
||
| # Enable globalization and time zones: | ||
| # https://github.com/dotnet/dotnet-docker/blob/main/samples/enable-globalization.md | ||
| # final stage/image | ||
| FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview-alpine | ||
| WORKDIR /app | ||
| COPY --from=build /app . | ||
| USER $APP_UID | ||
| ENTRYPOINT ["./aspnetapp"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,23 +8,16 @@ WORKDIR /source | |
| COPY aspnetapp/*.csproj . | ||
| RUN dotnet restore -a $TARGETARCH | ||
|
|
||
| # copy and publish app and libraries | ||
| COPY aspnetapp/. . | ||
| RUN dotnet publish -a $TARGETARCH --no-restore -o /app | ||
|
|
||
|
|
||
| # Enable globalization and time zones: | ||
| # https://github.com/dotnet/dotnet-docker/blob/main/samples/enable-globalization.md | ||
| # final stage/image | ||
| FROM mcr.microsoft.com/dotnet/nightly/aspnet:8.0-preview-alpine-composite | ||
| WORKDIR /app | ||
| COPY --from=build /app . | ||
| USER $APP_UID | ||
| ENTRYPOINT ["./aspnetapp"] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| # Learn about building .NET container images: | ||
| # https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md | ||
| FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-preview-alpine AS build | ||
| ARG TARGETARCH | ||
| WORKDIR /source | ||
|
|
||
| # copy csproj and restore as distinct layers | ||
| COPY aspnetapp/*.csproj . | ||
| RUN dotnet restore -a $TARGETARCH | ||
|
|
||
| # copy and publish app and libraries | ||
| COPY aspnetapp/. . | ||
| RUN dotnet publish -a $TARGETARCH --no-restore -o /app | ||
|
|
||
|
|
||
| # Enable globalization and time zones: | ||
| # https://github.com/dotnet/dotnet-docker/blob/main/samples/enable-globalization.md | ||
| # final stage/image | ||
| FROM mcr.microsoft.com/dotnet/aspnet:8.0-preview-alpine | ||
|
|
||
| ENV \ | ||
| DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ | ||
|
|
@@ -28,4 +28,5 @@ RUN apk add --no-cache \ | |
|
|
||
| WORKDIR /app | ||
| COPY --from=build /app . | ||
| USER $APP_UID | ||
| ENTRYPOINT ["./aspnetapp"] | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be needed anymore.