From b36cc1d36edb415dc6a04c0a65ae8906bb3372b1 Mon Sep 17 00:00:00 2001 From: Andy De George <2672110+Thraka@users.noreply.github.com> Date: Tue, 9 Jul 2019 08:31:28 -0700 Subject: [PATCH 1/4] Adjust title to clarify ASP.NET Core and not .NET Core We had an [issue over on the .NET Core documentation](https://github.com/dotnet/docs/pull/13278) regarding Docker where someone was confused about .NET Core vs ASP.NET Core and pointed out that this article used the terms interchangeably. I wanted to submit this fix to hopefully reduce that. I also: 1. Removed the en-us from links. --- engine/examples/dotnetcore.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/examples/dotnetcore.md b/engine/examples/dotnetcore.md index 20542d5964..3e37e8816d 100644 --- a/engine/examples/dotnetcore.md +++ b/engine/examples/dotnetcore.md @@ -1,7 +1,7 @@ --- description: Create a Docker image by layering your ASP.NET Core app on debian for Linux Containers or with Windows Nano Server containers using a Dockerfile. keywords: dockerize, dockerizing, dotnet, .NET, Core, article, example, platform, installation, containers, images, image, dockerfile, build, asp.net, asp.net core -title: Dockerize a .NET Core application +title: Dockerize an ASP.NET Core application --- ## Introduction @@ -33,7 +33,7 @@ tutorial](https://www.asp.net/get-started) to initialize a project or clone our 1. Create a `Dockerfile` in your project folder. 2. Add the text below to your `Dockerfile` for either Linux or [Windows - Containers](https://docs.microsoft.com/en-us/virtualization/windowscontainers/about/). + Containers](https://docs.microsoft.com/virtualization/windowscontainers/about/). The tags below are multi-arch meaning they pull either Windows or Linux containers depending on what mode is set in [Docker Desktop for Windows](/docker-for-windows/). Read more on [switching containers](/docker-for-windows/#switch-between-windows-and-linux-containers). @@ -95,7 +95,7 @@ $ docker run -d -p 8080:80 --name myapp aspnetapp ## Further reading - - [ASP.NET Core](https://docs.microsoft.com/en-us/aspnet/core/) + - [ASP.NET Core](https://docs.microsoft.com/aspnet/core/) - [Microsoft ASP.NET Core on Docker Hub](https://hub.docker.com/r/microsoft/dotnet/) - [Building Docker Images for .NET Core Applications](https://docs.microsoft.com/dotnet/core/docker/building-net-docker-images) - [Docker Tools for Visual Studio](https://docs.microsoft.com/dotnet/articles/core/docker/visual-studio-tools-for-docker) From 829efd8d92f55fa4e0d53c3e7bc1f4dd21e2222a Mon Sep 17 00:00:00 2001 From: Andy De George <2672110+Thraka@users.noreply.github.com> Date: Tue, 9 Jul 2019 08:35:13 -0700 Subject: [PATCH 2/4] Update index.md --- engine/examples/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/examples/index.md b/engine/examples/index.md index 74fe14bad9..8c24111c1f 100644 --- a/engine/examples/index.md +++ b/engine/examples/index.md @@ -11,5 +11,5 @@ This section contains the following: * [Dockerizing PostgreSQL](postgresql_service.md) * [Dockerizing a CouchDB service](couchdb_data_volumes.md) * [Dockerizing an apt-cacher-ng service](apt-cacher-ng.md) -* [Dockerizing a .NET Core application](dotnetcore.md) +* [Dockerizing an ASP.NET Core application](dotnetcore.md) * [Get Started](/get-started/) From fb1f15cfd9a76d8f94542217b650988e1d9c2cd0 Mon Sep 17 00:00:00 2001 From: Andy De George <2672110+Thraka@users.noreply.github.com> Date: Tue, 9 Jul 2019 08:36:54 -0700 Subject: [PATCH 3/4] Fix TOC for .NET Core -> ASP.NET Core --- _data/toc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/toc.yaml b/_data/toc.yaml index d5d5939122..3e18ac5f10 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1117,7 +1117,7 @@ samples: - path: /engine/examples/apt-cacher-ng/ title: apt-cacher-ng - path: /engine/examples/dotnetcore/ - title: .NET Core application + title: ASP.NET Core application - path: /compose/aspnet-mssql-compose/ title: ASP.NET Core + SQL Server on Linux - path: /engine/examples/couchdb_data_volumes/ From 660c43bba3e9e16cf78ae14b89ddc3220464ccfb Mon Sep 17 00:00:00 2001 From: Andy De George <2672110+Thraka@users.noreply.github.com> Date: Tue, 9 Jul 2019 09:22:11 -0700 Subject: [PATCH 4/4] Change link to latest article on docs.ms --- engine/examples/dotnetcore.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/examples/dotnetcore.md b/engine/examples/dotnetcore.md index 3e37e8816d..6be27fd0ea 100644 --- a/engine/examples/dotnetcore.md +++ b/engine/examples/dotnetcore.md @@ -97,5 +97,5 @@ $ docker run -d -p 8080:80 --name myapp aspnetapp - [ASP.NET Core](https://docs.microsoft.com/aspnet/core/) - [Microsoft ASP.NET Core on Docker Hub](https://hub.docker.com/r/microsoft/dotnet/) - - [Building Docker Images for .NET Core Applications](https://docs.microsoft.com/dotnet/core/docker/building-net-docker-images) + - [Building Docker Docker Images for ASP.NET Core](https://docs.microsoft.com/aspnet/core/host-and-deploy/docker/building-net-docker-images) - [Docker Tools for Visual Studio](https://docs.microsoft.com/dotnet/articles/core/docker/visual-studio-tools-for-docker)