Skip to content

Commit

Permalink
Document 5.0 as current release version (dotnet#2352)
Browse files Browse the repository at this point in the history
  • Loading branch information
mthalman committed Nov 4, 2020
1 parent d8b002f commit 27f84e0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 11 deletions.
4 changes: 3 additions & 1 deletion README.aspnet.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ As part of the .NET 5.0 release, all .NET Docker images (including .NET Core 2.1

# Featured Tags

* `5.0` (Preview)
* `5.0` (Current)
* `docker pull mcr.microsoft.com/dotnet/aspnet:5.0`
* `3.1` (LTS)
* `docker pull mcr.microsoft.com/dotnet/aspnet:3.1`

# About This Image

Expand Down
4 changes: 3 additions & 1 deletion README.runtime-deps.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ As part of the .NET 5.0 release, all .NET Docker images (including .NET Core 2.1

# Featured Tags

* `5.0` (Preview)
* `5.0` (Current)
* `docker pull mcr.microsoft.com/dotnet/runtime-deps:5.0`
* `3.1` (LTS)
* `docker pull mcr.microsoft.com/dotnet/runtime-deps:3.1`

# About This Image

Expand Down
4 changes: 3 additions & 1 deletion README.runtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ As part of the .NET 5.0 release, all .NET Docker images (including .NET Core 2.1

# Featured Tags

* `5.0` (Preview)
* `5.0` (Current)
* `docker pull mcr.microsoft.com/dotnet/runtime:5.0`
* `3.1` (LTS)
* `docker pull mcr.microsoft.com/dotnet/runtime:3.1`

# About This Image

Expand Down
4 changes: 3 additions & 1 deletion README.sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ As part of the .NET 5.0 release, all .NET Docker images (including .NET Core 2.1

# Featured Tags

* `5.0` (Preview)
* `5.0` (Current)
* `docker pull mcr.microsoft.com/dotnet/sdk:5.0`
* `3.1` (LTS)
* `docker pull mcr.microsoft.com/dotnet/sdk:3.1`

# About This Image

Expand Down
16 changes: 9 additions & 7 deletions eng/readme-templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ See [dotnet](https://hub.docker.com/_/microsoft-dotnet/) for images with officia
* `docker pull mcr.microsoft.com/dotnet/samples:dotnetapp`
* `aspnetapp` [(*Dockerfile*)](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile)
* `docker pull mcr.microsoft.com/dotnet/samples:aspnetapp`
^elif match(PARENT_REPO, "core"):* `3.1` (LTS/Current)
* `docker pull {{FULL_REPO}}:3.1`
^else:* `5.0` (Preview)
^elif match(SHORT_REPO, "monitor"):* `5.0` (Preview)
* `docker pull {{FULL_REPO}}:5.0`
^else:* `5.0` (Current)
* `docker pull {{FULL_REPO}}:5.0`
* `3.1` (LTS)
* `docker pull {{FULL_REPO}}:3.1`
}}}}{{if IS_PRODUCT_FAMILY && VARIABLES["branch"] = "master"
:# Featured Repos

Expand Down Expand Up @@ -49,13 +51,13 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast

{{if !IS_PRODUCT_FAMILY || VARIABLES["branch"] = "nightly"
:* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET
}}{{if (PARENT_REPO = "dotnet" && SHORT_REPO != "sdk") || (PARENT_REPO = "core" && SHORT_REPO = "sdk")
}}{{if (PARENT_REPO = "dotnet" && SHORT_REPO != "sdk")
:* [dotnet/sdk](https://hub.docker.com/_/microsoft-dotnet-sdk/): .NET SDK
}}{{if (PARENT_REPO = "dotnet" && SHORT_REPO != "aspnet") || (PARENT_REPO = "core" && SHORT_REPO = "aspnet")
}}{{if (PARENT_REPO = "dotnet" && SHORT_REPO != "aspnet")
:* [dotnet/aspnet](https://hub.docker.com/_/microsoft-dotnet-aspnet/): ASP.NET Core Runtime
}}{{if (PARENT_REPO = "dotnet" && SHORT_REPO != "runtime") || (PARENT_REPO = "core" && SHORT_REPO = "runtime")
}}{{if (PARENT_REPO = "dotnet" && SHORT_REPO != "runtime")
:* [dotnet/runtime](https://hub.docker.com/_/microsoft-dotnet-runtime/): .NET Runtime
}}{{if (PARENT_REPO = "dotnet" && SHORT_REPO != "runtime-deps") || (PARENT_REPO = "core" && SHORT_REPO = "runtime-deps")
}}{{if (PARENT_REPO = "dotnet" && SHORT_REPO != "runtime-deps")
:* [dotnet/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-runtime-deps/): .NET Runtime Dependencies
}}{{if REPO != "dotnet/samples"
:* [dotnet/samples](https://hub.docker.com/_/microsoft-dotnet-samples/): .NET Samples
Expand Down

0 comments on commit 27f84e0

Please sign in to comment.