Update Dockerfiles for 7.0.200 and remove PublishSingleFile

README.samples.md

@@ -60,19 +60,19 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn
 ## Linux amd64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-dotnetapp-alpine-slim-amd64, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/Dockerfile.alpine-x64-slim) | Alpine
+dotnetapp-alpine-slim-amd64, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/Dockerfile.alpine-slim) | Alpine
 aspnetapp-alpine-slim-amd64, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/Dockerfile.alpine-slim) | Alpine
 
 ## Linux arm32 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-dotnetapp-alpine-slim-arm32v7, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/Dockerfile.alpine-arm32-slim) | Alpine
+dotnetapp-alpine-slim-arm32v7, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/Dockerfile.alpine-slim) | Alpine
 aspnetapp-alpine-slim-arm32v7, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/Dockerfile.alpine-slim) | Alpine
 
 ## Linux arm64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-dotnetapp-alpine-slim-arm64v8, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/Dockerfile.alpine-arm64-slim) | Alpine
+dotnetapp-alpine-slim-arm64v8, dotnetapp, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/Dockerfile.alpine-slim) | Alpine
 aspnetapp-alpine-slim-arm64v8, aspnetapp | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/Dockerfile.alpine-slim) | Alpine
 
 ## Nano Server 2022 amd64 Tags

manifest.samples.json

@@ -31,7 +31,7 @@
           },
           "platforms": [
             {
-              "dockerfile": "samples/dotnetapp/Dockerfile.alpine-x64-slim",
+              "dockerfile": "samples/dotnetapp/Dockerfile.alpine-slim",
               "os": "linux",
               "osVersion": "alpine",
               "tags": {
@@ -40,7 +40,7 @@
             },
             {
               "architecture": "arm",
-              "dockerfile": "samples/dotnetapp/Dockerfile.alpine-arm32-slim",
+              "dockerfile": "samples/dotnetapp/Dockerfile.alpine-slim",
               "os": "linux",
               "osVersion": "alpine",
               "tags": {
@@ -50,7 +50,7 @@
             },
             {
               "architecture": "arm64",
-              "dockerfile": "samples/dotnetapp/Dockerfile.alpine-arm64-slim",
+              "dockerfile": "samples/dotnetapp/Dockerfile.alpine-slim",
               "os": "linux",
               "osVersion": "alpine",
               "tags": {

samples/README.md

@@ -1,36 +1,40 @@
-# .NET Docker samples
+# .NET container samples
 
-The following samples and guidance demonstrate how to use .NET and Docker for development, testing and production. You can use the samples as the basis of your own Docker images or just to learn.
+The following samples and guidance demonstrate how to use .NET and Docker for development, testing and production. You can equally use the samples for learning about containers or as the basis of your own container images.
 
 ## Building images
 
-* [Build a .NET Docker image](dotnetapp/README.md)
-* [Build an ASP.NET Core Docker image](aspnetapp/README.md)
-* [Build and test a multi-project solution](complexapp/README.md)
-* [Building a globalization aware (or unaware) image](globalapp/README.md)
+* [Build a .NET container image](dotnetapp/README.md)
+* [Build an ASP.NET Core container image](aspnetapp/README.md)
+* [Building a globalization and time zone aware (or unaware) image](globalapp/README.md)
+* [Container best practices](container-best-practices.md)
 * [Build for a platform](build-for-a-platform.md)
-* [Enable (or disable) globalization](enable-globalization.md)
 
 ## Development guidance
 
-* [Establishing a Docker environment](establishing-docker-environment.md)
-* [Selecting .NET image tags](selecting-tags.md)
+* [Selecting .NET image tags](../documentation/supported-tags.md)
+* [Enable (or disable) globalization](enable-globalization.md)
+* [Build and test a multi-project solution](complexapp/README.md)
 * [Run test in a container](run-tests-in-sdk-container.md)
 * [Build in an SDK container](build-in-sdk-container.md)
 * [Run applications in an SDK container](run-in-sdk-container.md)
-* [Run ASP.NET Core Applications in development with Docker and HTTPS](run-aspnetcore-https-development.md)
+* [Run ASP.NET Core Applications in development with container and HTTPS](run-aspnetcore-https-development.md)
 * [Discover licensing for Linux image contents](https://github.com/dotnet/dotnet-docker/blob/main/documentation/image-artifact-details.md)
 
 ## Hosting guidance
 
-* [Host ASP.NET Core Images with Docker and HTTPS](host-aspnetcore-https.md)
-* [Push Docker Images to Azure Container Registry](push-image-to-acr.md)
-* [Push Docker Images to Docker Hub](push-image-to-dockerhub.md)
+* [Host ASP.NET Core Images with container and HTTPS](host-aspnetcore-https.md)
+* [Push container images to Azure Container Registry](push-image-to-acr.md)
+* [Push container images to Docker Hub](push-image-to-dockerhub.md)
 * [Deploy ASP.NET Core Applications to Azure Container Instances](deploy-container-to-aci.md)
 
-## Scenario guidance
+## Other documentation
 
-You can find tips and tricks, best practices, and samples of commonly used technology in the [.NET Docker scenarios documentation](../documentation/scenarios/README.md).
+* [Introduction to .NET and Docker](https://learn.microsoft.com/dotnet/core/docker/)]
+* [Announcing built-in container support for the .NET SDK](https://devblogs.microsoft.com/dotnet/announcing-builtin-container-support-for-the-dotnet-sdk/)
+* [Staying safe in containers](https://devblogs.microsoft.com/dotnet/staying-safe-with-dotnet-containers/)
+* [Improving multi-platform container support](https://devblogs.microsoft.com/dotnet/improving-multiplatform-container-support/)
+* [Container blog posts](https://devblogs.microsoft.com/dotnet/category/containers/)
 
 ## Try pre-built images
 

samples/aspnetapp/Dockerfile

@@ -1,4 +1,5 @@
-# https://hub.docker.com/_/microsoft-dotnet
+# Learn about building .NET container images:
+# https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md
 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /source
 
@@ -8,7 +9,8 @@ RUN dotnet restore --use-current-runtime
 
 # copy everything else and build app
 COPY aspnetapp/. .
-RUN dotnet publish -c Release -o /app --use-current-runtime --self-contained false --no-restore
+RUN dotnet publish --use-current-runtime --self-contained false --no-restore -o /app
+
 
 # final stage/image
 FROM mcr.microsoft.com/dotnet/aspnet:7.0

samples/aspnetapp/Dockerfile.alpine

@@ -1,3 +1,5 @@
+# Learn about building .NET container images:
+# https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md
 FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
 
 WORKDIR /source
@@ -8,9 +10,10 @@ RUN dotnet restore --use-current-runtime
 
 # copy everything else and build app
 COPY aspnetapp/. .
-RUN dotnet publish --use-current-runtime -c Release --self-contained false --no-restore -o /app
+RUN dotnet publish --use-current-runtime --self-contained false --no-restore -o /app
 
-# To enable globalization:
+
+# 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:7.0-alpine

samples/aspnetapp/Dockerfile.alpine-icu

@@ -1,3 +1,5 @@
+# Learn about building .NET container images:
+# https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md
 FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
 
 WORKDIR /source
@@ -8,9 +10,10 @@ RUN dotnet restore --use-current-runtime
 
 # copy everything else and build app
 COPY aspnetapp/. .
-RUN dotnet publish --use-current-runtime -c Release --self-contained false --no-restore -o /app
+RUN dotnet publish --use-current-runtime --self-contained false --no-restore -o /app
 
-# To learn about globalization:
+
+# 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:7.0-alpine

samples/aspnetapp/Dockerfile.alpine-non-root

@@ -1,3 +1,5 @@
+# Learn about building .NET container images:
+# https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md
 FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/nightly/sdk:8.0-preview-alpine AS build
 ARG TARGETARCH
 WORKDIR /source
@@ -11,7 +13,7 @@ COPY aspnetapp/. .
 RUN dotnet publish -a $TARGETARCH --self-contained false --no-restore -o /app
 
 
-# To enable globalization:
+# Enable globalization and time zones:
 # https://github.com/dotnet/dotnet-docker/blob/main/samples/enable-globalization.md
 # final stage/image
 # .NET 8 tag includes `-preview`

samples/aspnetapp/Dockerfile.alpine-slim

@@ -1,4 +1,5 @@
-# https://hub.docker.com/_/microsoft-dotnet
+# Learn about building .NET container images:
+# https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md
 FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
 WORKDIR /source
 
@@ -8,9 +9,10 @@ RUN dotnet restore --use-current-runtime /p:PublishReadyToRun=true
 
 # copy everything else and build app
 COPY aspnetapp/. .
-RUN dotnet publish -c Release -o /app --use-current-runtime --no-restore /p:PublishTrimmed=true /p:PublishReadyToRun=true /p:PublishSingleFile=true
+RUN dotnet publish --use-current-runtime --no-restore -o /app /p:PublishTrimmed=true /p:PublishReadyToRun=true
 
-# To enable globalization:
+
+# 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/runtime-deps:7.0-alpine

samples/aspnetapp/Dockerfile.chiseled

@@ -1,4 +1,5 @@
-# https://hub.docker.com/_/microsoft-dotnet
+# Learn about building .NET container images:
+# https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md
 FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy AS build
 WORKDIR /source
 
@@ -8,10 +9,11 @@ RUN dotnet restore --use-current-runtime
 
 # copy everything else and build app
 COPY aspnetapp/. .
-RUN dotnet publish -c Release -o /app --use-current-runtime --self-contained false --no-restore
+RUN dotnet publish --use-current-runtime --self-contained false --no-restore -o /app
+
 
 # final stage/image
 FROM mcr.microsoft.com/dotnet/nightly/aspnet:7.0-jammy-chiseled
 WORKDIR /app
 COPY --from=build /app .
-ENTRYPOINT ["dotnet", "aspnetapp.dll"]
+ENTRYPOINT ["./aspnetapp.dll"]

samples/aspnetapp/Dockerfile.debian

@@ -0,0 +1,19 @@
+# Learn about building .NET container images:
+# https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md
+FROM mcr.microsoft.com/dotnet/sdk:7.0-bullseye-slim AS build
+WORKDIR /source
+
+# copy csproj and restore as distinct layers
+COPY aspnetapp/*.csproj .
+RUN dotnet restore --use-current-runtime  
+
+# copy everything else and build app
+COPY aspnetapp/. .
+RUN dotnet publish --use-current-runtime --self-contained false --no-restore -o /app
+
+
+# final stage/image
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-bullseye-slim
+WORKDIR /app
+COPY --from=build /app .
+ENTRYPOINT ["./aspnetapp.dll"]