From 9bc86a4a3c175d121a2fb8e5e311f20b589f5d0f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 8 May 2020 16:13:20 -0500 Subject: [PATCH 1/4] Update 5.0 repo name to "nightly" instead of "core-nightly" (#1888) --- README.aspnet.md | 46 ++---- README.aspnet.preview.md | 138 ++++++++++++++++++ README.md | 30 ++-- README.runtime-deps.md | 19 --- README.runtime-deps.preview.md | 96 ++++++++++++ README.runtime.md | 34 ----- README.runtime.preview.md | 122 ++++++++++++++++ README.samples.md | 2 +- README.sdk.md | 33 ----- README.sdk.preview.md | 124 ++++++++++++++++ eng/Get-TagsDocumentation.ps1 | 22 ++- .../aspnet-tags.yml | 45 ++---- .../core-aspnet-tags.yml | 26 ++++ .../core-runtime-deps-tags.yml | 20 +++ .../core-runtime-tags.yml | 26 ++++ .../core-sdk-tags.yml | 24 +++ .../runtime-deps-tags.yml | 33 +---- .../runtime-tags.yml | 45 ++---- eng/mcr-tags-metadata-templates/sdk-tags.yml | 41 ++---- manifest.json | 120 +++++++++------ .../ImageData.cs | 10 +- .../ProductImageData.cs | 13 +- .../SampleImageData.cs | 2 +- 23 files changed, 747 insertions(+), 324 deletions(-) create mode 100644 README.aspnet.preview.md create mode 100644 README.runtime-deps.preview.md create mode 100644 README.runtime.preview.md create mode 100644 README.sdk.preview.md create mode 100644 eng/mcr-tags-metadata-templates/core-aspnet-tags.yml create mode 100644 eng/mcr-tags-metadata-templates/core-runtime-deps-tags.yml create mode 100644 eng/mcr-tags-metadata-templates/core-runtime-tags.yml create mode 100644 eng/mcr-tags-metadata-templates/core-sdk-tags.yml diff --git a/README.aspnet.md b/README.aspnet.md index 6e48e3a5b7..3c2b99d5e2 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -12,7 +12,7 @@ For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules) # About This Image -This image contains the ASP.NET Core and .NET Core runtimes and libraries and is optimized for running ASP.NET Core apps in production. +This image contains the ASP.NET Core and .NET Core runtimes and libraries and is optimized for running ASP.NET Core apps in production. This repository is limited to .NET Core 2.1 and 3.1. For .NET 5.0 and higher, see the [readme](README.aspnet.preview.md) for those versions. Watch [dotnet/announcements](https://github.com/dotnet/announcements/labels/Docker) for Docker-related .NET announcements. @@ -43,8 +43,18 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn * [dotnet/core/runtime](https://hub.docker.com/_/microsoft-dotnet-core-runtime/): .NET Core Runtime * [dotnet/core/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-core-runtime-deps/): .NET Core Runtime Dependencies * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples + +.NET Core (Preview): + * [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) +.NET (Preview): + +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) +* [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/): .NET SDK (Preview) +* [dotnet/nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime/): .NET Runtime (Preview) +* [dotnet/nightly/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview) + .NET Framework: * [dotnet/framework](https://hub.docker.com/_/microsoft-dotnet-framework/): .NET Framework, ASP.NET and WCF @@ -66,13 +76,6 @@ Tags | Dockerfile | OS Version 2.1.18-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/focal/amd64/Dockerfile) | Ubuntu 20.04 2.1.18-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/bionic/amd64/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim, 5.0-buster-slim, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/amd64/Dockerfile) | Debian 10 -5.0.0-preview.3-alpine3.11, 5.0-alpine3.11, 5.0.0-preview.3-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/alpine3.11/amd64/Dockerfile) | Alpine 3.11 -5.0.0-preview.3-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/focal/amd64/Dockerfile) | Ubuntu 20.04 - ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- @@ -82,13 +85,6 @@ Tags | Dockerfile | OS Version 3.1.4-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/focal/arm64v8/Dockerfile) | Ubuntu 20.04 3.1.4-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/arm64v8/Dockerfile) | Debian 10 -5.0.0-preview.3-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8, 5.0.0-preview.3-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 -5.0.0-preview.3-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/focal/arm64v8/Dockerfile) | Ubuntu 20.04 - ## Linux arm32 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- @@ -97,44 +93,24 @@ Tags | Dockerfile | OS Version 2.1.18-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/stretch-slim/arm32v7/Dockerfile) | Debian 9 2.1.18-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/arm32v7/Dockerfile) | Debian 10 - ## Windows Server, version 1909 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.4-nanoserver-1909, 3.1-nanoserver-1909, 3.1.4, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1909/amd64/Dockerfile) 2.1.18-nanoserver-1909, 2.1-nanoserver-1909, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1909/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.0-preview.3-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1909/amd64/Dockerfile) - ## Windows Server, version 1903 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.4-nanoserver-1903, 3.1-nanoserver-1903, 3.1.4, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1903/amd64/Dockerfile) 2.1.18-nanoserver-1903, 2.1-nanoserver-1903, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1903/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.0-preview.3-nanoserver-1903, 5.0-nanoserver-1903, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1903/amd64/Dockerfile) - ## Windows Server 2019 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.4-nanoserver-1809, 3.1-nanoserver-1809, 3.1.4, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/aspnet/nanoserver-1809/amd64/Dockerfile) 2.1.18-nanoserver-1809, 2.1-nanoserver-1809, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/aspnet/nanoserver-1809/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.0-preview.3-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1809/amd64/Dockerfile) - You can retrieve a list of all available tags for dotnet/core/aspnet at https://mcr.microsoft.com/v2/dotnet/core/aspnet/tags/list. # Support diff --git a/README.aspnet.preview.md b/README.aspnet.preview.md new file mode 100644 index 0000000000..9021455deb --- /dev/null +++ b/README.aspnet.preview.md @@ -0,0 +1,138 @@ +## Important: Client Firewall Rules Update to Microsoft Container Registry (MCR) + +To provide a consistent FQDNs, the data endpoint will be changing from *.cdn.mscr.io to *.data.mcr.microsoft.com + +For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules). +--------------------------------------------------------------------------------- + +The images from the dotnet/nightly repositories include last-known-good (LKG) builds for the next release of [.NET](https://github.com/dotnet/core). + +See [dotnet/dotnet-docker](https://hub.docker.com/r/microsoft/dotnet/) for images with official releases of [.NET](https://github.com/dotnet/core). + +As part of the transition to .NET 5.0, Docker repos for .NET 5.0 and higher do not include `core` in the name as was done with older versions. As an example, ASP.NET Core 5.0 can be found at `mcr.microsoft.com/dotnet/nightly/aspnet:5.0` while 3.1 is still at `mcr.microsoft.com/dotnet/core-nightly/aspnet:3.1`. See the [related issue](https://github.com/dotnet/dotnet-docker/issues/1765) for more details. + +# Featured Tags + +* `5.0` (Preview) + * `docker pull mcr.microsoft.com/dotnet/nightly/aspnet:5.0` + +# About This Image + +This image contains the ASP.NET Core and .NET Core runtimes and libraries and is optimized for running ASP.NET Core apps in production. + +Watch [dotnet/announcements](https://github.com/dotnet/announcements/labels/Docker) for Docker-related .NET announcements. + +# How to Use the Image + +The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/samples/README.md) show various ways to use .NET Core and Docker together. See [Building Docker Images for .NET Applications](https://docs.microsoft.com/dotnet/core/docker/building-net-docker-images) to learn more. + +## Container sample: Run a web application + +You can quickly run a container with a pre-built [.NET Docker image](https://hub.docker.com/_/microsoft-dotnet-core-samples/), based on the [ASP.NET Core sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/README.md). + +Type the following command to run a sample web application: + +```console +docker run -it --rm -p 8000:80 --name aspnetcore_sample mcr.microsoft.com/dotnet/core/samples:aspnetapp +``` + +After the application starts, navigate to `http://localhost:8000` in your web browser. + +See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotnet/dotnet-docker/blob/master/samples/host-aspnetcore-https.md) to use HTTPS with this image. + +# Related Repos + +.NET Core: + +* [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core +* [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples + +.NET Core (Preview): + +* [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) +* [dotnet/core-nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-core-nightly-sdk/): .NET Core SDK (Preview) +* [dotnet/core-nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-core-nightly-runtime/): .NET Core Runtime (Preview) +* [dotnet/core-nightly/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-core-nightly-runtime-deps/): .NET Core Runtime Dependencies (Preview) + +.NET (Preview): + +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) +* [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/): .NET SDK (Preview) +* [dotnet/nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime/): .NET Runtime (Preview) +* [dotnet/nightly/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview) + +.NET Framework: + +* [dotnet/framework](https://hub.docker.com/_/microsoft-dotnet-framework/): .NET Framework, ASP.NET and WCF +* [dotnet/framework/samples](https://hub.docker.com/_/microsoft-dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples + +# Full Tag Listing + +## Linux amd64 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim, 5.0-buster-slim, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/amd64/Dockerfile) | Debian 10 +5.0.0-preview.3-alpine3.11, 5.0-alpine3.11, 5.0.0-preview.3-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +5.0.0-preview.3-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/focal/amd64/Dockerfile) | Ubuntu 20.04 + +## Linux arm64 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/arm64v8/Dockerfile) | Debian 10 +5.0.0-preview.3-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8, 5.0.0-preview.3-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +5.0.0-preview.3-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/focal/arm64v8/Dockerfile) | Ubuntu 20.04 + +## Linux arm32 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/buster-slim/arm32v7/Dockerfile) | Debian 10 + +## Windows Server, version 1909 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.0-preview.3-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1909/amd64/Dockerfile) + +## Windows Server, version 1903 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.0-preview.3-nanoserver-1903, 5.0-nanoserver-1903, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1903/amd64/Dockerfile) + +## Windows Server 2019 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.0-preview.3-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/aspnet/nanoserver-1809/amd64/Dockerfile) + +You can retrieve a list of all available tags for dotnet/aspnet at https://mcr.microsoft.com/v2/dotnet/aspnet/tags/list. + +# Support + +See [Microsoft Support for .NET](https://github.com/dotnet/core/blob/master/microsoft-support.md) for the support lifecycle. + +# Image Update Policy + +* We update the supported .NET images within 12 hours of any updates to their base images (e.g. debian:buster-slim, windows/nanoserver:1909, buildpack-deps:bionic-scm, etc.). +* We publish .NET images as part of releasing new versions of .NET including major/minor and servicing. + +# Feedback + +* [File a .NET Docker issue](https://github.com/dotnet/dotnet-docker/issues) +* [File a .NET issue](https://github.com/dotnet/core/issues) +* [File an ASP.NET Core issue](https://github.com/aspnet/home/issues) +* [File an issue for other .NET components](https://github.com/dotnet/core/blob/master/Documentation/core-repos.md) +* [File a Visual Studio Docker Tools issue](https://github.com/microsoft/dockertools/issues) +* [File a Microsoft Container Registry (MCR) issue](https://github.com/microsoft/containerregistry/issues) +* [Ask on Stack Overflow](https://stackoverflow.com/questions/tagged/.net-core) +* [Contact Microsoft Support](https://support.microsoft.com/contactus/) + +# License + +* [.NET license](https://github.com/dotnet/dotnet-docker/blob/master/LICENSE) +* [Discover licensing for Linux image contents](https://github.com/dotnet/dotnet-docker/blob/master/documentation/image-artifact-details.md) +* [Windows Nano Server license](https://hub.docker.com/_/microsoft-windows-nanoserver/) (only applies to Windows containers) +* [Pricing and licensing for Windows Server 2019](https://www.microsoft.com/cloud-platform/windows-server-pricing) diff --git a/README.md b/README.md index dbe81fdefd..47837a06c7 100644 --- a/README.md +++ b/README.md @@ -13,15 +13,15 @@ For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules) * [dotnet/core/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-core-runtime-deps/): .NET Core Runtime Dependencies * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples -# About .NET Core +# About .NET -[.NET Core](https://docs.microsoft.com/dotnet/core/) is a general purpose development platform maintained by Microsoft and the .NET community on [GitHub](https://github.com/dotnet/core). It is cross-platform, supporting Windows, macOS and Linux, and can be used in device, cloud, and embedded/IoT scenarios. +[.NET](https://docs.microsoft.com/dotnet/core/) is a general purpose development platform maintained by Microsoft and the .NET community on [GitHub](https://github.com/dotnet/core). It is cross-platform, supporting Windows, macOS and Linux, and can be used in device, cloud, and embedded/IoT scenarios. .NET has several capabilities that make development easier, including automatic memory management, (runtime) generic types, reflection, asynchrony, concurrency, and native interop. Millions of developers take advantage of these capabilities to efficiently build high-quality applications. -You can use C# to write .NET Core apps. C# is simple, powerful, type-safe, and object-oriented while retaining the expressiveness and elegance of C-style languages. Anyone familiar with C and similar languages will find it straightforward to write in C#. +You can use C# to write .NET apps. C# is simple, powerful, type-safe, and object-oriented while retaining the expressiveness and elegance of C-style languages. Anyone familiar with C and similar languages will find it straightforward to write in C#. -[.NET Core](https://github.com/dotnet/core) is open source (MIT and Apache 2 licenses) and was contributed to the [.NET Foundation](http://dotnetfoundation.org) by Microsoft in 2014. It can be freely adopted by individuals and companies, including for personal, academic or commercial purposes. Multiple companies use .NET Core as part of apps, tools, new platforms and hosting services. +[.NET](https://github.com/dotnet/core) is open source (MIT and Apache 2 licenses) and was contributed to the [.NET Foundation](http://dotnetfoundation.org) by Microsoft in 2014. It can be freely adopted by individuals and companies, including for personal, academic or commercial purposes. Multiple companies use .NET as part of apps, tools, new platforms and hosting services. You are invited to [contribute new features](https://github.com/dotnet/core/blob/master/CONTRIBUTING.md), fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can. @@ -31,11 +31,11 @@ Watch [dotnet/announcements](https://github.com/dotnet/announcements/labels/Dock # How to Use the Images -The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/samples/README.md) show various ways to use .NET Core and Docker together. See [Building Docker Images for .NET Core Applications](https://docs.microsoft.com/dotnet/core/docker/building-net-docker-images) to learn more. +The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/samples/README.md) show various ways to use .NET and Docker together. See [Building Docker Images for .NET Applications](https://docs.microsoft.com/dotnet/core/docker/building-net-docker-images) to learn more. ## Container sample: Run a simple application -You can quickly run a container with a pre-built [.NET Core Docker image](https://hub.docker.com/_/microsoft-dotnet-core-samples/), based on the [.NET Core console sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/README.md). +You can quickly run a container with a pre-built [.NET Docker image](https://hub.docker.com/_/microsoft-dotnet-core-samples/), based on the [.NET console sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/README.md). Type the following command to run a sample console application: @@ -45,7 +45,7 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples ## Container sample: Run a web application -You can quickly run a container with a pre-built [.NET Core Docker image](https://hub.docker.com/_/microsoft-dotnet-core-samples/), based on the [ASP.NET Core sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/README.md). +You can quickly run a container with a pre-built [.NET Docker image](https://hub.docker.com/_/microsoft-dotnet-core-samples/), based on the [ASP.NET Core sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/README.md). Type the following command to run a sample web application: @@ -59,9 +59,9 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn # Related Repos -.NET Core: +.NET: -* [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) +* [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET Core (Preview) .NET Framework: @@ -70,17 +70,17 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn # Support -See [Microsoft Support for .NET Core](https://github.com/dotnet/core/blob/master/microsoft-support.md) for the support lifecycle. +See [Microsoft Support for .NET](https://github.com/dotnet/core/blob/master/microsoft-support.md) for the support lifecycle. # Image Update Policy -* We update the supported .NET Core images within 12 hours of any updates to their base images (e.g. debian:buster-slim, windows/nanoserver:1909, buildpack-deps:bionic-scm, etc.). -* We publish .NET Core images as part of releasing new versions of .NET Core including major/minor and servicing. +* We update the supported .NET images within 12 hours of any updates to their base images (e.g. debian:buster-slim, windows/nanoserver:1909, buildpack-deps:bionic-scm, etc.). +* We publish .NET images as part of releasing new versions of .NET including major/minor and servicing. # Feedback -* [File a .NET Core Docker issue](https://github.com/dotnet/dotnet-docker/issues) -* [File a .NET Core issue](https://github.com/dotnet/core/issues) +* [File a .NET Docker issue](https://github.com/dotnet/dotnet-docker/issues) +* [File a .NET issue](https://github.com/dotnet/core/issues) * [File an ASP.NET Core issue](https://github.com/aspnet/home/issues) * [File an issue for other .NET components](https://github.com/dotnet/core/blob/master/Documentation/core-repos.md) * [File a Visual Studio Docker Tools issue](https://github.com/microsoft/dockertools/issues) @@ -90,7 +90,7 @@ See [Microsoft Support for .NET Core](https://github.com/dotnet/core/blob/master # License -* [.NET Core license](https://github.com/dotnet/dotnet-docker/blob/master/LICENSE) +* [.NET license](https://github.com/dotnet/dotnet-docker/blob/master/LICENSE) * [Discover licensing for Linux image contents](https://github.com/dotnet/dotnet-docker/blob/master/documentation/image-artifact-details.md) * [Windows Nano Server license](https://hub.docker.com/_/microsoft-windows-nanoserver/) (only applies to Windows containers) * [Pricing and licensing for Windows Server 2019](https://www.microsoft.com/cloud-platform/windows-server-pricing) diff --git a/README.runtime-deps.md b/README.runtime-deps.md index 1d2a2e1508..a015901386 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -54,13 +54,6 @@ Tags | Dockerfile | OS Version 2.1.18-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/focal/amd64/Dockerfile) | Ubuntu 20.04 2.1.18-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/amd64/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim, 5.0-buster-slim, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/amd64/Dockerfile) | Debian 10 -5.0.0-preview.3-alpine3.11, 5.0-alpine3.11, 5.0.0-preview.3-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/alpine3.11/amd64/Dockerfile) | Alpine 3.11 -5.0.0-preview.3-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/focal/amd64/Dockerfile) | Ubuntu 20.04 - ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- @@ -70,13 +63,6 @@ Tags | Dockerfile | OS Version 3.1.4-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/focal/arm64v8/Dockerfile) | Ubuntu 20.04 3.1.4-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime-deps/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/arm64v8/Dockerfile) | Debian 10 -5.0.0-preview.3-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8, 5.0.0-preview.3-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 -5.0.0-preview.3-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/focal/arm64v8/Dockerfile) | Ubuntu 20.04 - ## Linux arm32 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- @@ -85,11 +71,6 @@ Tags | Dockerfile | OS Version 2.1.18-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/stretch-slim/arm32v7/Dockerfile) | Debian 9 2.1.18-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime-deps/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/arm32v7/Dockerfile) | Debian 10 - You can retrieve a list of all available tags for dotnet/core/runtime-deps at https://mcr.microsoft.com/v2/dotnet/core/runtime-deps/tags/list. # Support diff --git a/README.runtime-deps.preview.md b/README.runtime-deps.preview.md new file mode 100644 index 0000000000..b148c93ebb --- /dev/null +++ b/README.runtime-deps.preview.md @@ -0,0 +1,96 @@ +## Important: Client Firewall Rules Update to Microsoft Container Registry (MCR) + +To provide a consistent FQDNs, the data endpoint will be changing from *.cdn.mscr.io to *.data.mcr.microsoft.com + +For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules). +--------------------------------------------------------------------------------- + +The images from the dotnet/nightly repositories include last-known-good (LKG) builds for the next release of [.NET](https://github.com/dotnet/core). + +See [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/) for images with official releases of [.NET](https://github.com/dotnet/core). + +# Featured Tags + +* `5.0` (Preview) + * `docker pull mcr.microsoft.com/dotnet/nightly/runtime-deps:5.0` + +# About This Image + +This image contains the native dependencies needed by .NET. It does not include .NET. It is for [self-contained](https://docs.microsoft.com/dotnet/articles/core/deploying/index) applications. + +Watch [dotnet/announcements](https://github.com/dotnet/announcements/labels/Docker) for Docker-related .NET announcements. + +# How to Use the Image + +The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/samples/README.md) show various ways to use .NET and Docker together. See [Building Docker Images for .NET Applications](https://docs.microsoft.com/dotnet/core/docker/building-net-docker-images) to learn more. + +* [.NET self-contained Sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/dotnet-docker-selfcontained.md) - This [sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile.debian-x64-selfcontained) builds and runs an application as a self-contained application. + +# Related Repos + +.NET: + +* [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core +* [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) +* [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/): .NET SDK (Preview) +* [dotnet/nightly/aspnet](https://hub.docker.com/_/microsoft-dotnet-nightly-aspnet/): ASP.NET Core Runtime (Preview) +* [dotnet/nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime/): .NET Runtime (Preview) + +.NET Framework: + +* [dotnet/framework](https://hub.docker.com/_/microsoft-dotnet-framework/): .NET Framework, ASP.NET and WCF +* [dotnet/framework/samples](https://hub.docker.com/_/microsoft-dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples + +# Full Tag Listing + +## Linux amd64 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim, 5.0-buster-slim, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/amd64/Dockerfile) | Debian 10 +5.0.0-preview.3-alpine3.11, 5.0-alpine3.11, 5.0.0-preview.3-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +5.0.0-preview.3-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/focal/amd64/Dockerfile) | Ubuntu 20.04 + +## Linux arm64 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/arm64v8/Dockerfile) | Debian 10 +5.0.0-preview.3-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8, 5.0.0-preview.3-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +5.0.0-preview.3-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/focal/arm64v8/Dockerfile) | Ubuntu 20.04 + +## Linux arm32 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime-deps/buster-slim/arm32v7/Dockerfile) | Debian 10 + +You can retrieve a list of all available tags for dotnet/runtime-deps at https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list. + +# Support + +See [Microsoft Support for .NET Core](https://github.com/dotnet/core/blob/master/microsoft-support.md) for the support lifecycle. + +# Image Update Policy + +* We update the supported .NET images within 12 hours of any updates to their base images (e.g. debian:buster-slim, windows/nanoserver:1909, buildpack-deps:bionic-scm, etc.). +* We publish .NET images as part of releasing new versions of .NET including major/minor and servicing. + +# Feedback + +* [File a .NET Docker issue](https://github.com/dotnet/dotnet-docker/issues) +* [File a .NET issue](https://github.com/dotnet/core/issues) +* [File an ASP.NET Core issue](https://github.com/aspnet/home/issues) +* [File an issue for other .NET components](https://github.com/dotnet/core/blob/master/Documentation/core-repos.md) +* [File a Visual Studio Docker Tools issue](https://github.com/microsoft/dockertools/issues) +* [File a Microsoft Container Registry (MCR) issue](https://github.com/microsoft/containerregistry/issues) +* [Ask on Stack Overflow](https://stackoverflow.com/questions/tagged/.net-core) +* [Contact Microsoft Support](https://support.microsoft.com/contactus/) + +# License + +* [.NET license](https://github.com/dotnet/dotnet-docker/blob/master/LICENSE) +* [Discover licensing for Linux image contents](https://github.com/dotnet/dotnet-docker/blob/master/documentation/image-artifact-details.md) +* [Windows Nano Server license](https://hub.docker.com/_/microsoft-windows-nanoserver/) (only applies to Windows containers) +* [Pricing and licensing for Windows Server 2019](https://www.microsoft.com/cloud-platform/windows-server-pricing) diff --git a/README.runtime.md b/README.runtime.md index 87332ac904..69276f28ae 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -62,13 +62,6 @@ Tags | Dockerfile | OS Version 2.1.18-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/focal/amd64/Dockerfile) | Ubuntu 20.04 2.1.18-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/bionic/amd64/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim, 5.0-buster-slim, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/amd64/Dockerfile) | Debian 10 -5.0.0-preview.3-alpine3.11, 5.0-alpine3.11, 5.0.0-preview.3-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/alpine3.11/amd64/Dockerfile) | Alpine 3.11 -5.0.0-preview.3-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/focal/amd64/Dockerfile) | Ubuntu 20.04 - ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- @@ -78,13 +71,6 @@ Tags | Dockerfile | OS Version 3.1.4-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/focal/arm64v8/Dockerfile) | Ubuntu 20.04 3.1.4-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/arm64v8/Dockerfile) | Debian 10 -5.0.0-preview.3-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8, 5.0.0-preview.3-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 -5.0.0-preview.3-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/focal/arm64v8/Dockerfile) | Ubuntu 20.04 - ## Linux arm32 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- @@ -93,44 +79,24 @@ Tags | Dockerfile | OS Version 2.1.18-stretch-slim-arm32v7, 2.1-stretch-slim-arm32v7, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/stretch-slim/arm32v7/Dockerfile) | Debian 9 2.1.18-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.0-preview.3-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/arm32v7/Dockerfile) | Debian 10 - ## Windows Server, version 1909 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.4-nanoserver-1909, 3.1-nanoserver-1909, 3.1.4, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1909/amd64/Dockerfile) 2.1.18-nanoserver-1909, 2.1-nanoserver-1909, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1909/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.0-preview.3-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1909/amd64/Dockerfile) - ## Windows Server, version 1903 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.4-nanoserver-1903, 3.1-nanoserver-1903, 3.1.4, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1903/amd64/Dockerfile) 2.1.18-nanoserver-1903, 2.1-nanoserver-1903, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1903/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.0-preview.3-nanoserver-1903, 5.0-nanoserver-1903, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1903/amd64/Dockerfile) - ## Windows Server 2019 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.4-nanoserver-1809, 3.1-nanoserver-1809, 3.1.4, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/runtime/nanoserver-1809/amd64/Dockerfile) 2.1.18-nanoserver-1809, 2.1-nanoserver-1809, 2.1.18, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/runtime/nanoserver-1809/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.0-preview.3-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1809/amd64/Dockerfile) - You can retrieve a list of all available tags for dotnet/core/runtime at https://mcr.microsoft.com/v2/dotnet/core/runtime/tags/list. # Support diff --git a/README.runtime.preview.md b/README.runtime.preview.md new file mode 100644 index 0000000000..634d269b4d --- /dev/null +++ b/README.runtime.preview.md @@ -0,0 +1,122 @@ +## Important: Client Firewall Rules Update to Microsoft Container Registry (MCR) + +To provide a consistent FQDNs, the data endpoint will be changing from *.cdn.mscr.io to *.data.mcr.microsoft.com + +For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules). +--------------------------------------------------------------------------------- + +The images from the dotnet/nightly repositories include last-known-good (LKG) builds for the next release of [.NET](https://github.com/dotnet/core). + +See [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/) for images with official releases of [.NET](https://github.com/dotnet/core). + +# Featured Tags + +* `5.0` (Preview) + * `docker pull mcr.microsoft.com/dotnet/nightly/runtime:5.0` + +# About This Image + +This image contains the .NET runtimes and libraries and is optimized for running .NET apps in production. + +Watch [dotnet/announcements](https://github.com/dotnet/announcements/labels/Docker) for Docker-related .NET announcements. + +# How to Use the Image + +The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/samples/README.md) show various ways to use .NET and Docker together. See [Building Docker Images for .NET Applications](https://docs.microsoft.com/dotnet/core/docker/building-net-docker-images) to learn more. + +## Container sample: Run a simple application + +You can quickly run a container with a pre-built [.NET Docker image](https://hub.docker.com/_/microsoft-dotnet-core-samples/), based on the [.NET console sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/README.md). + +Type the following command to run a sample console application: + +```console +docker run --rm mcr.microsoft.com/dotnet/core/samples +``` + +# Related Repos + +.NET: + +* [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core +* [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) +* [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/): .NET SDK (Preview) +* [dotnet/nightly/aspnet](https://hub.docker.com/_/microsoft-dotnet-nightly-aspnet/): ASP.NET Core Runtime (Preview) +* [dotnet/nightly/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview) + +.NET Framework: + +* [dotnet/framework](https://hub.docker.com/_/microsoft-dotnet-framework/): .NET Framework, ASP.NET and WCF +* [dotnet/framework/samples](https://hub.docker.com/_/microsoft-dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples + +# Full Tag Listing + +## Linux amd64 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim, 5.0-buster-slim, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/amd64/Dockerfile) | Debian 10 +5.0.0-preview.3-alpine3.11, 5.0-alpine3.11, 5.0.0-preview.3-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +5.0.0-preview.3-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/focal/amd64/Dockerfile) | Ubuntu 20.04 + +## Linux arm64 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/arm64v8/Dockerfile) | Debian 10 +5.0.0-preview.3-alpine3.11-arm64v8, 5.0-alpine3.11-arm64v8, 5.0.0-preview.3-alpine-arm64v8, 5.0-alpine-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/alpine3.11/arm64v8/Dockerfile) | Alpine 3.11 +5.0.0-preview.3-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/focal/arm64v8/Dockerfile) | Ubuntu 20.04 + +## Linux arm32 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.0-preview.3-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/buster-slim/arm32v7/Dockerfile) | Debian 10 + +## Windows Server, version 1909 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.0-preview.3-nanoserver-1909, 5.0-nanoserver-1909, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1909/amd64/Dockerfile) + +## Windows Server, version 1903 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.0-preview.3-nanoserver-1903, 5.0-nanoserver-1903, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1903/amd64/Dockerfile) + +## Windows Server 2019 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.0-preview.3-nanoserver-1809, 5.0-nanoserver-1809, 5.0.0-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/runtime/nanoserver-1809/amd64/Dockerfile) + +You can retrieve a list of all available tags for dotnet/runtime at https://mcr.microsoft.com/v2/dotnet/runtime/tags/list. + +# Support + +See [Microsoft Support for .NET](https://github.com/dotnet/core/blob/master/microsoft-support.md) for the support lifecycle. + +# Image Update Policy + +* We update the supported .NET images within 12 hours of any updates to their base images (e.g. debian:buster-slim, windows/nanoserver:1909, buildpack-deps:bionic-scm, etc.). +* We publish .NET images as part of releasing new versions of .NET including major/minor and servicing. + +# Feedback + +* [File a .NET Docker issue](https://github.com/dotnet/dotnet-docker/issues) +* [File a .NET issue](https://github.com/dotnet/core/issues) +* [File an ASP.NET Core issue](https://github.com/aspnet/home/issues) +* [File an issue for other .NET components](https://github.com/dotnet/core/blob/master/Documentation/core-repos.md) +* [File a Visual Studio Docker Tools issue](https://github.com/microsoft/dockertools/issues) +* [File a Microsoft Container Registry (MCR) issue](https://github.com/microsoft/containerregistry/issues) +* [Ask on Stack Overflow](https://stackoverflow.com/questions/tagged/.net-core) +* [Contact Microsoft Support](https://support.microsoft.com/contactus/) + +# License + +* [.NET license](https://github.com/dotnet/dotnet-docker/blob/master/LICENSE) +* [Discover licensing for Linux image contents](https://github.com/dotnet/dotnet-docker/blob/master/documentation/image-artifact-details.md) +* [Windows Nano Server license](https://hub.docker.com/_/microsoft-windows-nanoserver/) (only applies to Windows containers) +* [Pricing and licensing for Windows Server 2019](https://www.microsoft.com/cloud-platform/windows-server-pricing) diff --git a/README.samples.md b/README.samples.md index 1c1ebcabc4..2e04ab3c67 100644 --- a/README.samples.md +++ b/README.samples.md @@ -55,7 +55,7 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn * [dotnet/core/aspnet](https://hub.docker.com/_/microsoft-dotnet-core-aspnet/): ASP.NET Core Runtime * [dotnet/core/runtime](https://hub.docker.com/_/microsoft-dotnet-core-runtime/): .NET Core Runtime * [dotnet/core/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-core-runtime-deps/): .NET Core Runtime Dependencies -* [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET Core (Preview) .NET Framework: diff --git a/README.sdk.md b/README.sdk.md index 07a58968fa..a911cd55f5 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -66,13 +66,6 @@ Tags | Dockerfile | OS Version 2.1.806-focal, 2.1-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/focal/amd64/Dockerfile) | Ubuntu 20.04 2.1.806-bionic, 2.1-bionic | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/bionic/amd64/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.100-preview.3-buster-slim, 5.0-buster-slim, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/amd64/Dockerfile) | Debian 10 -5.0.100-preview.3-alpine3.11, 5.0-alpine3.11, 5.0.100-preview.3-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/alpine3.11/amd64/Dockerfile) | Alpine 3.11 -5.0.100-preview.3-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/focal/amd64/Dockerfile) | Ubuntu 20.04 - ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- @@ -80,12 +73,6 @@ Tags | Dockerfile | OS Version 3.1.202-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/focal/arm64v8/Dockerfile) | Ubuntu 20.04 3.1.202-bionic-arm64v8, 3.1-bionic-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/bionic/arm64v8/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.100-preview.3-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/arm64v8/Dockerfile) | Debian 10 -5.0.100-preview.3-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/focal/arm64v8/Dockerfile) | Ubuntu 20.04 - ## Linux arm32 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- @@ -94,44 +81,24 @@ Tags | Dockerfile | OS Version 2.1.806-stretch-arm32v7, 2.1-stretch-arm32v7, 2.1.806, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/stretch/arm32v7/Dockerfile) | Debian 9 2.1.806-bionic-arm32v7, 2.1-bionic-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/bionic/arm32v7/Dockerfile) | Ubuntu 18.04 -##### .NET Core 5.0 Preview Tags -Tags | Dockerfile | OS Version ------------| -------------| ------------- -5.0.100-preview.3-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/arm32v7/Dockerfile) | Debian 10 - ## Windows Server, version 1909 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.202-nanoserver-1909, 3.1-nanoserver-1909, 3.1.202, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1909/amd64/Dockerfile) 2.1.806-nanoserver-1909, 2.1-nanoserver-1909, 2.1.806, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1909/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.100-preview.3-nanoserver-1909, 5.0-nanoserver-1909, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1909/amd64/Dockerfile) - ## Windows Server, version 1903 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.202-nanoserver-1903, 3.1-nanoserver-1903, 3.1.202, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1903/amd64/Dockerfile) 2.1.806-nanoserver-1903, 2.1-nanoserver-1903, 2.1.806, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1903/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.100-preview.3-nanoserver-1903, 5.0-nanoserver-1903, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1903/amd64/Dockerfile) - ## Windows Server 2019 amd64 Tags Tag | Dockerfile ---------| --------------- 3.1.202-nanoserver-1809, 3.1-nanoserver-1809, 3.1.202, 3.1, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/3.1/sdk/nanoserver-1809/amd64/Dockerfile) 2.1.806-nanoserver-1809, 2.1-nanoserver-1809, 2.1.806, 2.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/2.1/sdk/nanoserver-1809/amd64/Dockerfile) -##### .NET Core 5.0 Preview Tags -Tag | Dockerfile ----------| --------------- -5.0.100-preview.3-nanoserver-1809, 5.0-nanoserver-1809, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1809/amd64/Dockerfile) - You can retrieve a list of all available tags for dotnet/core/sdk at https://mcr.microsoft.com/v2/dotnet/core/sdk/tags/list. # Support diff --git a/README.sdk.preview.md b/README.sdk.preview.md new file mode 100644 index 0000000000..2b8e1f5859 --- /dev/null +++ b/README.sdk.preview.md @@ -0,0 +1,124 @@ +## Important: Client Firewall Rules Update to Microsoft Container Registry (MCR) + +To provide a consistent FQDNs, the data endpoint will be changing from *.cdn.mscr.io to *.data.mcr.microsoft.com + +For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules). +--------------------------------------------------------------------------------- + +The images from the dotnet/nightly repositories include last-known-good (LKG) builds for the next release of [.NET](https://github.com/dotnet/core). + +See [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/) for images with official releases of [.NET](https://github.com/dotnet/core). + +# Featured Tags + +* `5.0` (Preview) + * `docker pull mcr.microsoft.com/dotnet/nightly/sdk:5.0` + +# About This Image + +This image contains the .NET SDK which is comprised of three parts: + +1. .NET CLI +1. .NET +1. ASP.NET Core + +Use this image for your development process (developing, building and testing applications). + +# How to Use the Image + +The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/samples/README.md) show various ways to use .NET and Docker together. See [Building Docker Images for .NET Applications](https://docs.microsoft.com/dotnet/core/docker/building-net-docker-images) to learn more. + +## Building .NET Apps with Docker + +* [.NET Docker Sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/README.md) - This [sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/Dockerfile) builds, tests, and runs the sample. It includes and builds multiple projects. +* [ASP.NET Core Docker Sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/README.md) - This [sample](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/Dockerfile) demonstrates using Docker with an ASP.NET Core Web App. + +## Develop .NET Apps in a Container + +* [Develop .NET Applications](https://github.com/dotnet/dotnet-docker/blob/master/samples/dotnetapp/dotnet-docker-dev-in-container.md) - This sample shows how to develop, build and test .NET applications with Docker without the need to install the .NET SDK. +* [Develop ASP.NET Core Applications](https://github.com/dotnet/dotnet-docker/blob/master/samples/aspnetapp/aspnet-docker-dev-in-container.md) - This sample shows how to develop and test ASP.NET Core applications with Docker without the need to install the .NET SDK. + +# Related Repos + +.NET: + +* [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core +* [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) +* [dotnet/nightly/aspnet](https://hub.docker.com/_/microsoft-dotnet-nightly-aspnet/): ASP.NET Core Runtime (Preview) +* [dotnet/nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime/): .NET Runtime (Preview) +* [dotnet/nightly/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview) + +.NET Framework: + +* [dotnet/framework](https://hub.docker.com/_/microsoft-dotnet-framework/): .NET Framework, ASP.NET and WCF +* [dotnet/framework/samples](https://hub.docker.com/_/microsoft-dotnet-framework-samples/): .NET Framework, ASP.NET and WCF Samples + +# Full Tag Listing + +## Linux amd64 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.100-preview.3-buster-slim, 5.0-buster-slim, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/amd64/Dockerfile) | Debian 10 +5.0.100-preview.3-alpine3.11, 5.0-alpine3.11, 5.0.100-preview.3-alpine, 5.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/alpine3.11/amd64/Dockerfile) | Alpine 3.11 +5.0.100-preview.3-focal, 5.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/focal/amd64/Dockerfile) | Ubuntu 20.04 + +## Linux arm64 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.100-preview.3-buster-slim-arm64v8, 5.0-buster-slim-arm64v8, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/arm64v8/Dockerfile) | Debian 10 +5.0.100-preview.3-focal-arm64v8, 5.0-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/focal/arm64v8/Dockerfile) | Ubuntu 20.04 + +## Linux arm32 Tags +##### .NET 5.0 Preview Tags +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +5.0.100-preview.3-buster-slim-arm32v7, 5.0-buster-slim-arm32v7, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/buster-slim/arm32v7/Dockerfile) | Debian 10 + +## Windows Server, version 1909 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.100-preview.3-nanoserver-1909, 5.0-nanoserver-1909, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1909/amd64/Dockerfile) + +## Windows Server, version 1903 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.100-preview.3-nanoserver-1903, 5.0-nanoserver-1903, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1903/amd64/Dockerfile) + +## Windows Server 2019 amd64 Tags +##### .NET 5.0 Preview Tags +Tag | Dockerfile +---------| --------------- +5.0.100-preview.3-nanoserver-1809, 5.0-nanoserver-1809, 5.0.100-preview.3, 5.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/master/5.0/sdk/nanoserver-1809/amd64/Dockerfile) + +You can retrieve a list of all available tags for dotnet/sdk at https://mcr.microsoft.com/v2/dotnet/sdk/tags/list. + +# Support + +See [Microsoft Support for .NET Core](https://github.com/dotnet/core/blob/master/microsoft-support.md) for the support lifecycle. + +# Image Update Policy + +* We update the supported .NET Core images within 12 hours of any updates to their base images (e.g. debian:buster-slim, windows/nanoserver:1909, buildpack-deps:bionic-scm, etc.). +* We publish .NET Core images as part of releasing new versions of .NET Core including major/minor and servicing. + +# Feedback + +* [File a .NET Core Docker issue](https://github.com/dotnet/dotnet-docker/issues) +* [File a .NET Core issue](https://github.com/dotnet/core/issues) +* [File an ASP.NET Core issue](https://github.com/aspnet/home/issues) +* [File an issue for other .NET components](https://github.com/dotnet/core/blob/master/Documentation/core-repos.md) +* [File a Visual Studio Docker Tools issue](https://github.com/microsoft/dockertools/issues) +* [File a Microsoft Container Registry (MCR) issue](https://github.com/microsoft/containerregistry/issues) +* [Ask on Stack Overflow](https://stackoverflow.com/questions/tagged/.net-core) +* [Contact Microsoft Support](https://support.microsoft.com/contactus/) + +# License + +* [.NET Core license](https://github.com/dotnet/dotnet-docker/blob/master/LICENSE) +* [Windows Nano Server license](https://hub.docker.com/_/microsoft-windows-nanoserver/) (only applies to Windows containers) +* [Pricing and licensing for Windows Server 2019](https://www.microsoft.com/cloud-platform/windows-server-pricing) diff --git a/eng/Get-TagsDocumentation.ps1 b/eng/Get-TagsDocumentation.ps1 index e6e33bb8b9..1b696be32f 100644 --- a/eng/Get-TagsDocumentation.ps1 +++ b/eng/Get-TagsDocumentation.ps1 @@ -10,23 +10,33 @@ if (!$Branch) { $manifestJson = Get-Content ${repoRoot}/manifest.json | ConvertFrom-Json if ($manifestJson.Repos[0].Name.Contains("nightly")) { $Branch = "nightly" - $coreRepoName = "core-nightly" + $coreRepoName = "core-nightly/" + $previewCoreRepoName = "nightly/" } else { $Branch = "master" - $coreRepoName = "core" + $coreRepoName = "core/" + $previewCoreRepoName = "" } } $gitRepo = "https://github.com/dotnet/dotnet-docker" & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` - dotnet/$coreRepoName/runtime-deps README.runtime-deps.md manifest.json $gitRepo $Branch + dotnet/$($coreRepoName)runtime-deps README.runtime-deps.md manifest.json $gitRepo $Branch & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` - dotnet/$coreRepoName/runtime README.runtime.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage + dotnet/$($previewCoreRepoName)runtime-deps README.runtime-deps.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` - dotnet/$coreRepoName/aspnet README.aspnet.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage + dotnet/$($coreRepoName)runtime README.runtime.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` - dotnet/$coreRepoName/sdk README.sdk.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage + dotnet/$($previewCoreRepoName)runtime README.runtime.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage +& $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` + dotnet/$($coreRepoName)aspnet README.aspnet.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage +& $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` + dotnet/$($previewCoreRepoName)aspnet README.aspnet.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage +& $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` + dotnet/$($coreRepoName)sdk README.sdk.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage +& $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` + dotnet/$($previewCoreRepoName)sdk README.sdk.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` dotnet/core/samples README.samples.md manifest.samples.json $gitRepo -ReuseImageBuilderImage diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml index 5b08d640c5..0a5bb38109 100644 --- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml @@ -1,46 +1,21 @@ $(McrTagsYmlRepo:aspnet) -$(McrTagsYmlTagGroup:3.1-buster-slim) -$(McrTagsYmlTagGroup:3.1-alpine3.11) -$(McrTagsYmlTagGroup:3.1-alpine3.10) -$(McrTagsYmlTagGroup:3.1-focal) -$(McrTagsYmlTagGroup:3.1-bionic) -$(McrTagsYmlTagGroup:2.1-stretch-slim) -$(McrTagsYmlTagGroup:2.1-alpine3.11) -$(McrTagsYmlTagGroup:2.1-alpine3.10) -$(McrTagsYmlTagGroup:2.1-focal) -$(McrTagsYmlTagGroup:2.1-bionic) $(McrTagsYmlTagGroup:5.0-buster-slim) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-alpine3.11) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-focal) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) -$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) -$(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) -$(McrTagsYmlTagGroup:3.1-focal-arm64v8) -$(McrTagsYmlTagGroup:3.1-bionic-arm64v8) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-alpine3.11-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-focal-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) -$(McrTagsYmlTagGroup:3.1-bionic-arm32v7) -$(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) -$(McrTagsYmlTagGroup:2.1-bionic-arm32v7) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm32v7) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1909) -$(McrTagsYmlTagGroup:2.1-nanoserver-1909) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1909) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1903) -$(McrTagsYmlTagGroup:2.1-nanoserver-1903) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1903) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1809) -$(McrTagsYmlTagGroup:2.1-nanoserver-1809) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1809) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags diff --git a/eng/mcr-tags-metadata-templates/core-aspnet-tags.yml b/eng/mcr-tags-metadata-templates/core-aspnet-tags.yml new file mode 100644 index 0000000000..2e9a0a375d --- /dev/null +++ b/eng/mcr-tags-metadata-templates/core-aspnet-tags.yml @@ -0,0 +1,26 @@ +$(McrTagsYmlRepo:core-aspnet) +$(McrTagsYmlTagGroup:3.1-buster-slim) +$(McrTagsYmlTagGroup:3.1-alpine3.11) +$(McrTagsYmlTagGroup:3.1-alpine3.10) +$(McrTagsYmlTagGroup:3.1-focal) +$(McrTagsYmlTagGroup:3.1-bionic) +$(McrTagsYmlTagGroup:2.1-stretch-slim) +$(McrTagsYmlTagGroup:2.1-alpine3.11) +$(McrTagsYmlTagGroup:2.1-alpine3.10) +$(McrTagsYmlTagGroup:2.1-focal) +$(McrTagsYmlTagGroup:2.1-bionic) +$(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) +$(McrTagsYmlTagGroup:3.1-focal-arm64v8) +$(McrTagsYmlTagGroup:3.1-bionic-arm64v8) +$(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) +$(McrTagsYmlTagGroup:3.1-bionic-arm32v7) +$(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) +$(McrTagsYmlTagGroup:2.1-bionic-arm32v7) +$(McrTagsYmlTagGroup:3.1-nanoserver-1909) +$(McrTagsYmlTagGroup:2.1-nanoserver-1909) +$(McrTagsYmlTagGroup:3.1-nanoserver-1903) +$(McrTagsYmlTagGroup:2.1-nanoserver-1903) +$(McrTagsYmlTagGroup:3.1-nanoserver-1809) +$(McrTagsYmlTagGroup:2.1-nanoserver-1809) diff --git a/eng/mcr-tags-metadata-templates/core-runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/core-runtime-deps-tags.yml new file mode 100644 index 0000000000..8d9b7d532a --- /dev/null +++ b/eng/mcr-tags-metadata-templates/core-runtime-deps-tags.yml @@ -0,0 +1,20 @@ +$(McrTagsYmlRepo:core-runtime-deps) +$(McrTagsYmlTagGroup:3.1-buster-slim) +$(McrTagsYmlTagGroup:3.1-alpine3.11) +$(McrTagsYmlTagGroup:3.1-alpine3.10) +$(McrTagsYmlTagGroup:3.1-focal) +$(McrTagsYmlTagGroup:3.1-bionic) +$(McrTagsYmlTagGroup:2.1-stretch-slim) +$(McrTagsYmlTagGroup:2.1-alpine3.11) +$(McrTagsYmlTagGroup:2.1-alpine3.10) +$(McrTagsYmlTagGroup:2.1-focal) +$(McrTagsYmlTagGroup:2.1-bionic) +$(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) +$(McrTagsYmlTagGroup:3.1-focal-arm64v8) +$(McrTagsYmlTagGroup:3.1-bionic-arm64v8) +$(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) +$(McrTagsYmlTagGroup:3.1-bionic-arm32v7) +$(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) +$(McrTagsYmlTagGroup:2.1-bionic-arm32v7) diff --git a/eng/mcr-tags-metadata-templates/core-runtime-tags.yml b/eng/mcr-tags-metadata-templates/core-runtime-tags.yml new file mode 100644 index 0000000000..da3825e69b --- /dev/null +++ b/eng/mcr-tags-metadata-templates/core-runtime-tags.yml @@ -0,0 +1,26 @@ +$(McrTagsYmlRepo:core-runtime) +$(McrTagsYmlTagGroup:3.1-buster-slim) +$(McrTagsYmlTagGroup:3.1-alpine3.11) +$(McrTagsYmlTagGroup:3.1-alpine3.10) +$(McrTagsYmlTagGroup:3.1-focal) +$(McrTagsYmlTagGroup:3.1-bionic) +$(McrTagsYmlTagGroup:2.1-stretch-slim) +$(McrTagsYmlTagGroup:2.1-alpine3.11) +$(McrTagsYmlTagGroup:2.1-alpine3.10) +$(McrTagsYmlTagGroup:2.1-focal) +$(McrTagsYmlTagGroup:2.1-bionic) +$(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) +$(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) +$(McrTagsYmlTagGroup:3.1-focal-arm64v8) +$(McrTagsYmlTagGroup:3.1-bionic-arm64v8) +$(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) +$(McrTagsYmlTagGroup:3.1-bionic-arm32v7) +$(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) +$(McrTagsYmlTagGroup:2.1-bionic-arm32v7) +$(McrTagsYmlTagGroup:3.1-nanoserver-1909) +$(McrTagsYmlTagGroup:2.1-nanoserver-1909) +$(McrTagsYmlTagGroup:3.1-nanoserver-1903) +$(McrTagsYmlTagGroup:2.1-nanoserver-1903) +$(McrTagsYmlTagGroup:3.1-nanoserver-1809) +$(McrTagsYmlTagGroup:2.1-nanoserver-1809) diff --git a/eng/mcr-tags-metadata-templates/core-sdk-tags.yml b/eng/mcr-tags-metadata-templates/core-sdk-tags.yml new file mode 100644 index 0000000000..d9da224cf1 --- /dev/null +++ b/eng/mcr-tags-metadata-templates/core-sdk-tags.yml @@ -0,0 +1,24 @@ +$(McrTagsYmlRepo:core-sdk) +$(McrTagsYmlTagGroup:3.1-buster) +$(McrTagsYmlTagGroup:3.1-alpine3.11) +$(McrTagsYmlTagGroup:3.1-alpine3.10) +$(McrTagsYmlTagGroup:3.1-focal) +$(McrTagsYmlTagGroup:3.1-bionic) +$(McrTagsYmlTagGroup:2.1-stretch) +$(McrTagsYmlTagGroup:2.1-alpine3.11) +$(McrTagsYmlTagGroup:2.1-alpine3.10) +$(McrTagsYmlTagGroup:2.1-focal) +$(McrTagsYmlTagGroup:2.1-bionic) +$(McrTagsYmlTagGroup:3.1-buster-arm64v8) +$(McrTagsYmlTagGroup:3.1-focal-arm64v8) +$(McrTagsYmlTagGroup:3.1-bionic-arm64v8) +$(McrTagsYmlTagGroup:3.1-buster-arm32v7) +$(McrTagsYmlTagGroup:3.1-bionic-arm32v7) +$(McrTagsYmlTagGroup:2.1-stretch-arm32v7) +$(McrTagsYmlTagGroup:2.1-bionic-arm32v7) +$(McrTagsYmlTagGroup:3.1-nanoserver-1909) +$(McrTagsYmlTagGroup:2.1-nanoserver-1909) +$(McrTagsYmlTagGroup:3.1-nanoserver-1903) +$(McrTagsYmlTagGroup:2.1-nanoserver-1903) +$(McrTagsYmlTagGroup:3.1-nanoserver-1809) +$(McrTagsYmlTagGroup:2.1-nanoserver-1809) diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml index 8afefac500..462e1c0278 100644 --- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml @@ -1,34 +1,15 @@ $(McrTagsYmlRepo:runtime-deps) -$(McrTagsYmlTagGroup:3.1-buster-slim) -$(McrTagsYmlTagGroup:3.1-alpine3.11) -$(McrTagsYmlTagGroup:3.1-alpine3.10) -$(McrTagsYmlTagGroup:3.1-focal) -$(McrTagsYmlTagGroup:3.1-bionic) -$(McrTagsYmlTagGroup:2.1-stretch-slim) -$(McrTagsYmlTagGroup:2.1-alpine3.11) -$(McrTagsYmlTagGroup:2.1-alpine3.10) -$(McrTagsYmlTagGroup:2.1-focal) -$(McrTagsYmlTagGroup:2.1-bionic) $(McrTagsYmlTagGroup:5.0-buster-slim) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-alpine3.11) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-focal) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) -$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) -$(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) -$(McrTagsYmlTagGroup:3.1-focal-arm64v8) -$(McrTagsYmlTagGroup:3.1-bionic-arm64v8) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-alpine3.11-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-focal-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) -$(McrTagsYmlTagGroup:3.1-bionic-arm32v7) -$(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) -$(McrTagsYmlTagGroup:2.1-bionic-arm32v7) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm32v7) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml index 5308881d94..87c8a243e0 100644 --- a/eng/mcr-tags-metadata-templates/runtime-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml @@ -1,46 +1,21 @@ $(McrTagsYmlRepo:runtime) -$(McrTagsYmlTagGroup:3.1-buster-slim) -$(McrTagsYmlTagGroup:3.1-alpine3.11) -$(McrTagsYmlTagGroup:3.1-alpine3.10) -$(McrTagsYmlTagGroup:3.1-focal) -$(McrTagsYmlTagGroup:3.1-bionic) -$(McrTagsYmlTagGroup:2.1-stretch-slim) -$(McrTagsYmlTagGroup:2.1-alpine3.11) -$(McrTagsYmlTagGroup:2.1-alpine3.10) -$(McrTagsYmlTagGroup:2.1-focal) -$(McrTagsYmlTagGroup:2.1-bionic) $(McrTagsYmlTagGroup:5.0-buster-slim) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-alpine3.11) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-focal) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-buster-slim-arm64v8) -$(McrTagsYmlTagGroup:3.1-alpine3.11-arm64v8) -$(McrTagsYmlTagGroup:3.1-alpine3.10-arm64v8) -$(McrTagsYmlTagGroup:3.1-focal-arm64v8) -$(McrTagsYmlTagGroup:3.1-bionic-arm64v8) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-alpine3.11-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-focal-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-buster-slim-arm32v7) -$(McrTagsYmlTagGroup:3.1-bionic-arm32v7) -$(McrTagsYmlTagGroup:2.1-stretch-slim-arm32v7) -$(McrTagsYmlTagGroup:2.1-bionic-arm32v7) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm32v7) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1909) -$(McrTagsYmlTagGroup:2.1-nanoserver-1909) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1909) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1903) -$(McrTagsYmlTagGroup:2.1-nanoserver-1903) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1903) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1809) -$(McrTagsYmlTagGroup:2.1-nanoserver-1809) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1809) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml index dd663c1900..6d88894d19 100644 --- a/eng/mcr-tags-metadata-templates/sdk-tags.yml +++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml @@ -1,42 +1,19 @@ $(McrTagsYmlRepo:sdk) -$(McrTagsYmlTagGroup:3.1-buster) -$(McrTagsYmlTagGroup:3.1-alpine3.11) -$(McrTagsYmlTagGroup:3.1-alpine3.10) -$(McrTagsYmlTagGroup:3.1-focal) -$(McrTagsYmlTagGroup:3.1-bionic) -$(McrTagsYmlTagGroup:2.1-stretch) -$(McrTagsYmlTagGroup:2.1-alpine3.11) -$(McrTagsYmlTagGroup:2.1-alpine3.10) -$(McrTagsYmlTagGroup:2.1-focal) -$(McrTagsYmlTagGroup:2.1-bionic) $(McrTagsYmlTagGroup:5.0-buster-slim) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-alpine3.11) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-focal) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-buster-arm64v8) -$(McrTagsYmlTagGroup:3.1-focal-arm64v8) -$(McrTagsYmlTagGroup:3.1-bionic-arm64v8) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-focal-arm64v8) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-buster-arm32v7) -$(McrTagsYmlTagGroup:3.1-bionic-arm32v7) -$(McrTagsYmlTagGroup:2.1-stretch-arm32v7) -$(McrTagsYmlTagGroup:2.1-bionic-arm32v7) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-buster-slim-arm32v7) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1909) -$(McrTagsYmlTagGroup:2.1-nanoserver-1909) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1909) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1903) -$(McrTagsYmlTagGroup:2.1-nanoserver-1903) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1903) - customSubTableTitle: .NET Core 5.0 Preview Tags -$(McrTagsYmlTagGroup:3.1-nanoserver-1809) -$(McrTagsYmlTagGroup:2.1-nanoserver-1809) + customSubTableTitle: .NET 5.0 Preview Tags $(McrTagsYmlTagGroup:5.0-nanoserver-1809) - customSubTableTitle: .NET Core 5.0 Preview Tags + customSubTableTitle: .NET 5.0 Preview Tags diff --git a/manifest.json b/manifest.json index 7bff3bdbc0..22404acfeb 100644 --- a/manifest.json +++ b/manifest.json @@ -11,10 +11,10 @@ }, "repos": [ { - "id": "runtime-deps", + "id": "core-runtime-deps", "name": "dotnet/core/runtime-deps", "readmePath": "README.runtime-deps.md", - "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/runtime-deps-tags.yml", + "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/core-runtime-deps-tags.yml", "images": [ { "productVersion": "$(2.1-RuntimeVersion)", @@ -389,7 +389,15 @@ "variant": "v8" } ] - }, + } + ] + }, + { + "id": "runtime-deps", + "name": "dotnet/runtime-deps", + "readmePath": "README.runtime-deps.preview.md", + "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/runtime-deps-tags.yml", + "images": [ { "productVersion": "$(5.0-RuntimeVersion)", "sharedTags": { @@ -497,10 +505,10 @@ ] }, { - "id": "runtime", + "id": "core-runtime", "name": "dotnet/core/runtime", "readmePath": "README.runtime.md", - "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/runtime-tags.yml", + "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/core-runtime-tags.yml", "images": [ { "productVersion": "$(2.1-RuntimeVersion)", @@ -511,7 +519,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/runtime/stretch-slim/amd64", "os": "linux", @@ -524,7 +532,7 @@ { "architecture": "arm", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/runtime/stretch-slim/arm32v7", "os": "linux", @@ -569,7 +577,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/runtime/alpine3.10/amd64", "os": "linux", @@ -605,7 +613,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/runtime/bionic/amd64", "os": "linux", @@ -623,7 +631,7 @@ { "architecture": "arm", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/runtime/bionic/arm32v7", "os": "linux", @@ -663,7 +671,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/buster-slim/amd64", "os": "linux", @@ -676,7 +684,7 @@ { "architecture": "arm", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/buster-slim/arm32v7", "os": "linux", @@ -690,7 +698,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/buster-slim/arm64v8", "os": "linux", @@ -735,7 +743,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/alpine3.10/amd64", "os": "linux", @@ -799,7 +807,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/alpine3.11/arm64v8", "os": "linux", @@ -815,7 +823,7 @@ { "name": "pr-build", "dependencies": [ - "$(Repo:sdk):3.1-buster-arm64v8" + "$(Repo:core-sdk):3.1-buster-arm64v8" ] } ] @@ -827,7 +835,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/bionic/amd64", "os": "linux", @@ -845,7 +853,7 @@ { "architecture": "arm", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/bionic/arm32v7", "os": "linux", @@ -864,7 +872,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/bionic/arm64v8", "os": "linux", @@ -912,7 +920,15 @@ "variant": "v8" } ] - }, + } + ] + }, + { + "id": "runtime", + "name": "dotnet/runtime", + "readmePath": "README.runtime.preview.md", + "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/runtime-tags.yml", + "images": [ { "productVersion": "$(5.0-RuntimeVersion)", "sharedTags": { @@ -1076,10 +1092,10 @@ ] }, { - "id": "aspnet", + "id": "core-aspnet", "name": "dotnet/core/aspnet", "readmePath": "README.aspnet.md", - "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/aspnet-tags.yml", + "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/core-aspnet-tags.yml", "images": [ { "productVersion": "$(2.1-RuntimeVersion)", @@ -1090,7 +1106,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/aspnet/stretch-slim/amd64", "os": "linux", @@ -1103,7 +1119,7 @@ { "architecture": "arm", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/aspnet/stretch-slim/arm32v7", "os": "linux", @@ -1148,7 +1164,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/aspnet/alpine3.10/amd64", "os": "linux", @@ -1184,7 +1200,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/aspnet/bionic/amd64", "os": "linux", @@ -1202,7 +1218,7 @@ { "architecture": "arm", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/aspnet/bionic/arm32v7", "os": "linux", @@ -1242,7 +1258,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/buster-slim/amd64", "os": "linux", @@ -1255,7 +1271,7 @@ { "architecture": "arm", "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/buster-slim/arm32v7", "os": "linux", @@ -1269,7 +1285,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/buster-slim/arm64v8", "os": "linux", @@ -1282,7 +1298,7 @@ }, { "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/nanoserver-1809/amd64", "os": "windows", @@ -1294,7 +1310,7 @@ }, { "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/nanoserver-1903/amd64", "os": "windows", @@ -1306,7 +1322,7 @@ }, { "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/nanoserver-1909/amd64", "os": "windows", @@ -1323,7 +1339,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/alpine3.10/amd64", "os": "linux", @@ -1387,7 +1403,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/alpine3.11/arm64v8", "os": "linux", @@ -1403,7 +1419,7 @@ { "name": "pr-build", "dependencies": [ - "$(Repo:sdk):3.1-buster-arm64v8" + "$(Repo:core-sdk):3.1-buster-arm64v8" ] } ] @@ -1415,7 +1431,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/bionic/amd64", "os": "linux", @@ -1433,7 +1449,7 @@ { "architecture": "arm", "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/bionic/arm32v7", "os": "linux", @@ -1452,7 +1468,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/bionic/arm64v8", "os": "linux", @@ -1500,7 +1516,15 @@ "variant": "v8" } ] - }, + } + ] + }, + { + "id": "aspnet", + "name": "dotnet/aspnet", + "readmePath": "README.aspnet.preview.md", + "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/aspnet-tags.yml", + "images": [ { "productVersion": "$(5.0-RuntimeVersion)", "sharedTags": { @@ -1673,10 +1697,10 @@ ] }, { - "id": "sdk", + "id": "core-sdk", "name": "dotnet/core/sdk", "readmePath": "README.sdk.md", - "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/sdk-tags.yml", + "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/core-sdk-tags.yml", "images": [ { "productVersion": "$(2.1-SdkVersion)", @@ -1739,7 +1763,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/sdk/alpine3.10/amd64", "os": "linux", @@ -2002,7 +2026,15 @@ "variant": "v8" } ] - }, + } + ] + }, + { + "id": "sdk", + "name": "dotnet/sdk", + "readmePath": "README.sdk.preview.md", + "mcrTagsMetadataTemplatePath": "eng/mcr-tags-metadata-templates/sdk-tags.yml", + "images": [ { "productVersion": "$(5.0-SdkVersion)", "sharedTags": { diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs index 938c72c2e1..29d40f15e7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ImageData.cs @@ -88,15 +88,11 @@ protected void PullImageIfNecessary(string imageName, DockerHelper dockerHelper) } } - public static string GetImageName(string tag, string variantName) - { - string repoSuffix = Config.IsNightlyRepo ? "-nightly" : string.Empty; - return GetImageName(tag, variantName, repoSuffix); - } + public static string GetRepoNameModifier() => $"/core{(Config.IsNightlyRepo ? "-nightly" : string.Empty)}"; - protected static string GetImageName(string tag, string variantName, string repoSuffix) + public static string GetImageName(string tag, string variantName, string repoNameModifier = null) { - string repo = $"dotnet/core{repoSuffix}/{variantName}"; + string repo = $"dotnet{repoNameModifier ?? GetRepoNameModifier()}/{variantName}"; string registry = GetRegistryName(repo, tag); return $"{registry}{repo}:{tag}"; diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs index ab65f72a3a..775b7f7707 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageData.cs @@ -36,11 +36,22 @@ public string SdkOS public override string GetIdentifier(string type) => $"{VersionString}-{base.GetIdentifier(type)}"; + public string GetProductImageName(string tag, string variantName) + { + string repoNameModifier = null; + if (Version.Major >= 5) + { + repoNameModifier = Config.IsNightlyRepo ? "/nightly" : string.Empty; + } + + return GetImageName(tag, variantName, repoNameModifier); + } + public string GetImage(DotNetImageType imageType, DockerHelper dockerHelper) { string variantName = Enum.GetName(typeof(DotNetImageType), imageType).ToLowerInvariant().Replace('_', '-'); string tag = GetTagName(imageType); - string imageName = GetImageName(tag, variantName); + string imageName = GetProductImageName(tag, variantName); PullImageIfNecessary(imageName, dockerHelper); diff --git a/tests/Microsoft.DotNet.Docker.Tests/SampleImageData.cs b/tests/Microsoft.DotNet.Docker.Tests/SampleImageData.cs index 1f4c8779e8..2fe733c885 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/SampleImageData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/SampleImageData.cs @@ -36,7 +36,7 @@ public string GetImage(SampleImageType imageType, DockerHelper dockerHelper) public static string GetImageName(string tag) { - return GetImageName(tag, "samples", repoSuffix: String.Empty); + return GetImageName(tag, "samples", "/core"); } } } From c9db391496a597fc4d36a68bf627bc58cc087229 Mon Sep 17 00:00:00 2001 From: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com> Date: Mon, 11 May 2020 10:34:12 -0500 Subject: [PATCH 2/4] Update common Docker engineering infrastructure with latest (#1903) --- eng/common/templates/variables/docker-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml index 7164648210..121033edaa 100644 --- a/eng/common/templates/variables/docker-images.yml +++ b/eng/common/templates/variables/docker-images.yml @@ -1,6 +1,6 @@ variables: - imageNames.imageBuilder.linux: mcr.microsoft.com/dotnet-buildtools/image-builder:linux-20200501213534 - imageNames.imageBuilder.windows: mcr.microsoft.com/dotnet-buildtools/image-builder:windows-20200501213534 + imageNames.imageBuilder.linux: mcr.microsoft.com/dotnet-buildtools/image-builder:linux-20200511142427 + imageNames.imageBuilder.windows: mcr.microsoft.com/dotnet-buildtools/image-builder:windows-20200511142427 imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId) imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-slim-docker-testrunner-d61254f-20190807161111 imageNames.testRunner.withrepo: testrunner-withrepo:$(Build.BuildId)-$(System.JobId) From 37e748cd0d478a5935753bc7d3582b1eccd67f2a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 12 May 2020 10:27:49 -0500 Subject: [PATCH 3/4] Readme updates for 5.0 repo name change (#1905) --- README.aspnet.md | 13 ++++--------- README.aspnet.preview.md | 12 +++--------- README.runtime-deps.md | 9 +++++++-- README.runtime-deps.preview.md | 8 +++++++- README.runtime.md | 9 +++++++-- README.runtime.preview.md | 8 +++++++- README.sdk.md | 9 +++++++-- README.sdk.preview.md | 8 +++++++- eng/Get-TagsDocumentation.ps1 | 12 ++++++------ 9 files changed, 55 insertions(+), 33 deletions(-) diff --git a/README.aspnet.md b/README.aspnet.md index 3c2b99d5e2..f4991904d5 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -12,7 +12,7 @@ For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules) # About This Image -This image contains the ASP.NET Core and .NET Core runtimes and libraries and is optimized for running ASP.NET Core apps in production. This repository is limited to .NET Core 2.1 and 3.1. For .NET 5.0 and higher, see the [readme](README.aspnet.preview.md) for those versions. +This image contains the ASP.NET Core and .NET Core runtimes and libraries and is optimized for running ASP.NET Core apps in production. This repository is limited to .NET Core 2.1 and 3.1. For .NET 5.0 and higher, see [dotnet/nightly/aspnet](https://hub.docker.com/_/microsoft-dotnet-nightly-aspnet/) for those versions. Watch [dotnet/announcements](https://github.com/dotnet/announcements/labels/Docker) for Docker-related .NET announcements. @@ -36,24 +36,19 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn # Related Repos -.NET Core: +.NET Core 2.1/3.1: * [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core * [dotnet/core/sdk](https://hub.docker.com/_/microsoft-dotnet-core-sdk/): .NET Core SDK * [dotnet/core/runtime](https://hub.docker.com/_/microsoft-dotnet-core-runtime/): .NET Core Runtime * [dotnet/core/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-core-runtime-deps/): .NET Core Runtime Dependencies * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples - -.NET Core (Preview): - * [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) -.NET (Preview): +.NET 5.0+: +* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET * [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) -* [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/): .NET SDK (Preview) -* [dotnet/nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime/): .NET Runtime (Preview) -* [dotnet/nightly/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime-deps/): .NET Runtime Dependencies (Preview) .NET Framework: diff --git a/README.aspnet.preview.md b/README.aspnet.preview.md index 9021455deb..9cdefdebdc 100644 --- a/README.aspnet.preview.md +++ b/README.aspnet.preview.md @@ -42,20 +42,14 @@ See [Hosting ASP.NET Core Images with Docker over HTTPS](https://github.com/dotn # Related Repos -.NET Core: +.NET Core 2.1/3.1: * [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples -.NET Core (Preview): - -* [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) -* [dotnet/core-nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-core-nightly-sdk/): .NET Core SDK (Preview) -* [dotnet/core-nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-core-nightly-runtime/): .NET Core Runtime (Preview) -* [dotnet/core-nightly/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-core-nightly-runtime-deps/): .NET Core Runtime Dependencies (Preview) - -.NET (Preview): +.NET 5.0+: +* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET * [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) * [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/): .NET SDK (Preview) * [dotnet/nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime/): .NET Runtime (Preview) diff --git a/README.runtime-deps.md b/README.runtime-deps.md index a015901386..87b28738e9 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -12,7 +12,7 @@ For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules) # About This Image -This image contains the native dependencies needed by .NET Core. It does not include .NET Core. It is for [self-contained](https://docs.microsoft.com/dotnet/articles/core/deploying/index) applications. +This image contains the native dependencies needed by .NET Core. It does not include .NET Core. It is for [self-contained](https://docs.microsoft.com/dotnet/articles/core/deploying/index) applications. This repository is limited to .NET Core 2.1 and 3.1. For .NET 5.0 and higher, see [dotnet/nightly/runtime-deps](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime-deps/) for those versions. Watch [dotnet/announcements](https://github.com/dotnet/announcements/labels/Docker) for Docker-related .NET announcements. @@ -24,7 +24,7 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast # Related Repos -.NET Core: +.NET Core 2.1/3.1: * [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core * [dotnet/core/sdk](https://hub.docker.com/_/microsoft-dotnet-core-sdk/): .NET Core SDK @@ -33,6 +33,11 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples * [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) +.NET 5.0+: + +* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) + .NET Framework: * [dotnet/framework](https://hub.docker.com/_/microsoft-dotnet-framework/): .NET Framework, ASP.NET and WCF diff --git a/README.runtime-deps.preview.md b/README.runtime-deps.preview.md index b148c93ebb..dc68b6cee8 100644 --- a/README.runtime-deps.preview.md +++ b/README.runtime-deps.preview.md @@ -9,6 +9,8 @@ The images from the dotnet/nightly repositories include last-known-good (LKG) bu See [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/) for images with official releases of [.NET](https://github.com/dotnet/core). +As part of the transition to .NET 5.0, Docker repos for .NET 5.0 and higher do not include `core` in the name as was done with older versions. As an example, ASP.NET Core 5.0 can be found at `mcr.microsoft.com/dotnet/nightly/runtime-deps:5.0` while 3.1 is still at `mcr.microsoft.com/dotnet/core-nightly/runtime-deps:3.1`. See the [related issue](https://github.com/dotnet/dotnet-docker/issues/1765) for more details. + # Featured Tags * `5.0` (Preview) @@ -28,10 +30,14 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/sa # Related Repos -.NET: +.NET Core 2.1/3.1: * [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples + +.NET 5.0+: + +* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET * [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) * [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/): .NET SDK (Preview) * [dotnet/nightly/aspnet](https://hub.docker.com/_/microsoft-dotnet-nightly-aspnet/): ASP.NET Core Runtime (Preview) diff --git a/README.runtime.md b/README.runtime.md index 69276f28ae..8fad6d888a 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -12,7 +12,7 @@ For more info, see [MCR Client Firewall Rules](https://aka.ms/mcr/firewallrules) # About This Image -This image contains the .NET Core runtimes and libraries and is optimized for running .NET Core apps in production. +This image contains the .NET Core runtimes and libraries and is optimized for running .NET Core apps in production. This repository is limited to .NET Core 2.1 and 3.1. For .NET 5.0 and higher, see [dotnet/nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime/) for those versions. Watch [dotnet/announcements](https://github.com/dotnet/announcements/labels/Docker) for Docker-related .NET announcements. @@ -32,7 +32,7 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples # Related Repos -.NET Core: +.NET Core 2.1/3.1: * [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core * [dotnet/core/sdk](https://hub.docker.com/_/microsoft-dotnet-core-sdk/): .NET Core SDK @@ -41,6 +41,11 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples * [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) +.NET 5.0+: + +* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) + .NET Framework: * [dotnet/framework](https://hub.docker.com/_/microsoft-dotnet-framework/): .NET Framework, ASP.NET and WCF diff --git a/README.runtime.preview.md b/README.runtime.preview.md index 634d269b4d..4bffbd0e10 100644 --- a/README.runtime.preview.md +++ b/README.runtime.preview.md @@ -9,6 +9,8 @@ The images from the dotnet/nightly repositories include last-known-good (LKG) bu See [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/) for images with official releases of [.NET](https://github.com/dotnet/core). +As part of the transition to .NET 5.0, Docker repos for .NET 5.0 and higher do not include `core` in the name as was done with older versions. As an example, ASP.NET Core 5.0 can be found at `mcr.microsoft.com/dotnet/nightly/runtime:5.0` while 3.1 is still at `mcr.microsoft.com/dotnet/core-nightly/runtime:3.1`. See the [related issue](https://github.com/dotnet/dotnet-docker/issues/1765) for more details. + # Featured Tags * `5.0` (Preview) @@ -36,10 +38,14 @@ docker run --rm mcr.microsoft.com/dotnet/core/samples # Related Repos -.NET: +.NET Core 2.1/3.1: * [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples + +.NET 5.0+: + +* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET * [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) * [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/): .NET SDK (Preview) * [dotnet/nightly/aspnet](https://hub.docker.com/_/microsoft-dotnet-nightly-aspnet/): ASP.NET Core Runtime (Preview) diff --git a/README.sdk.md b/README.sdk.md index a911cd55f5..3c44eeb1ff 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -18,7 +18,7 @@ This image contains the .NET Core SDK which is comprised of three parts: 1. .NET Core 1. ASP.NET Core -Use this image for your development process (developing, building and testing applications). +Use this image for your development process (developing, building and testing applications). This repository is limited to .NET Core 2.1 and 3.1. For .NET 5.0 and higher, see [dotnet/nightly/sdk](https://hub.docker.com/_/microsoft-dotnet-nightly-sdk/) for those versions. # How to Use the Image @@ -36,7 +36,7 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast # Related Repos -.NET Core: +.NET Core 2.1/3.1: * [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core * [dotnet/core/aspnet](https://hub.docker.com/_/microsoft-dotnet-core-aspnet/): ASP.NET Core Runtime @@ -45,6 +45,11 @@ The [.NET Core Docker samples](https://github.com/dotnet/dotnet-docker/blob/mast * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples * [dotnet/core-nightly](https://hub.docker.com/_/microsoft-dotnet-core-nightly/): .NET Core (Preview) +.NET 5.0+: + +* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET +* [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) + .NET Framework: * [dotnet/framework](https://hub.docker.com/_/microsoft-dotnet-framework/): .NET Framework, ASP.NET and WCF diff --git a/README.sdk.preview.md b/README.sdk.preview.md index 2b8e1f5859..d6ca7da513 100644 --- a/README.sdk.preview.md +++ b/README.sdk.preview.md @@ -9,6 +9,8 @@ The images from the dotnet/nightly repositories include last-known-good (LKG) bu See [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/) for images with official releases of [.NET](https://github.com/dotnet/core). +As part of the transition to .NET 5.0, Docker repos for .NET 5.0 and higher do not include `core` in the name as was done with older versions. As an example, ASP.NET Core 5.0 can be found at `mcr.microsoft.com/dotnet/nightly/sdk:5.0` while 3.1 is still at `mcr.microsoft.com/dotnet/core-nightly/sdk:3.1`. See the [related issue](https://github.com/dotnet/dotnet-docker/issues/1765) for more details. + # Featured Tags * `5.0` (Preview) @@ -40,10 +42,14 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/master/sa # Related Repos -.NET: +.NET Core 2.1/3.1: * [dotnet/core](https://hub.docker.com/_/microsoft-dotnet-core/): .NET Core * [dotnet/core/samples](https://hub.docker.com/_/microsoft-dotnet-core-samples/): .NET Core Samples + +.NET 5.0+: + +* [dotnet](https://hub.docker.com/_/microsoft-dotnet/): .NET * [dotnet/nightly](https://hub.docker.com/_/microsoft-dotnet-nightly/): .NET (Preview) * [dotnet/nightly/aspnet](https://hub.docker.com/_/microsoft-dotnet-nightly-aspnet/): ASP.NET Core Runtime (Preview) * [dotnet/nightly/runtime](https://hub.docker.com/_/microsoft-dotnet-nightly-runtime/): .NET Runtime (Preview) diff --git a/eng/Get-TagsDocumentation.ps1 b/eng/Get-TagsDocumentation.ps1 index 1b696be32f..cd5a01a713 100644 --- a/eng/Get-TagsDocumentation.ps1 +++ b/eng/Get-TagsDocumentation.ps1 @@ -11,12 +11,12 @@ if (!$Branch) { if ($manifestJson.Repos[0].Name.Contains("nightly")) { $Branch = "nightly" $coreRepoName = "core-nightly/" - $previewCoreRepoName = "nightly/" + $repoName = "nightly/" } else { $Branch = "master" $coreRepoName = "core/" - $previewCoreRepoName = "" + $repoName = "" } } @@ -25,18 +25,18 @@ $gitRepo = "https://github.com/dotnet/dotnet-docker" & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` dotnet/$($coreRepoName)runtime-deps README.runtime-deps.md manifest.json $gitRepo $Branch & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` - dotnet/$($previewCoreRepoName)runtime-deps README.runtime-deps.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage + dotnet/$($repoName)runtime-deps README.runtime-deps.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` dotnet/$($coreRepoName)runtime README.runtime.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` - dotnet/$($previewCoreRepoName)runtime README.runtime.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage + dotnet/$($repoName)runtime README.runtime.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` dotnet/$($coreRepoName)aspnet README.aspnet.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` - dotnet/$($previewCoreRepoName)aspnet README.aspnet.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage + dotnet/$($repoName)aspnet README.aspnet.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` dotnet/$($coreRepoName)sdk README.sdk.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` - dotnet/$($previewCoreRepoName)sdk README.sdk.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage + dotnet/$($repoName)sdk README.sdk.preview.md manifest.json $gitRepo $Branch -ReuseImageBuilderImage & $PSScriptRoot/common/Invoke-ReadmeGeneration.ps1 ` dotnet/core/samples README.samples.md manifest.samples.json $gitRepo -ReuseImageBuilderImage From 23d81b272859871ff351074d1a16bc9617835cce Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 13 May 2020 10:22:22 -0500 Subject: [PATCH 4/4] Fix repo references in manifest --- manifest.json | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/manifest.json b/manifest.json index 22404acfeb..e14ef0f4a1 100644 --- a/manifest.json +++ b/manifest.json @@ -594,7 +594,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/runtime/alpine3.11/amd64", "os": "linux", @@ -649,7 +649,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/runtime/focal/amd64", "os": "linux", @@ -761,7 +761,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/alpine3.10/arm64v8", "os": "linux", @@ -775,7 +775,7 @@ { "name": "pr-build", "dependencies": [ - "$(Repo:sdk):3.1-buster-arm64v8" + "$(Repo:core-sdk):3.1-buster-arm64v8" ] } ] @@ -787,7 +787,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/alpine3.11/amd64", "os": "linux", @@ -890,7 +890,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/focal/amd64", "os": "linux", @@ -908,7 +908,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "3.1/runtime/focal/arm64v8", "os": "linux", @@ -1181,7 +1181,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/aspnet/alpine3.11/amd64", "os": "linux", @@ -1236,7 +1236,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/aspnet/focal/amd64", "os": "linux", @@ -1357,7 +1357,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/alpine3.10/arm64v8", "os": "linux", @@ -1371,7 +1371,7 @@ { "name": "pr-build", "dependencies": [ - "$(Repo:sdk):3.1-buster-arm64v8" + "$(Repo:core-sdk):3.1-buster-arm64v8" ] } ] @@ -1383,7 +1383,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/alpine3.11/amd64", "os": "linux", @@ -1486,7 +1486,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/focal/amd64", "os": "linux", @@ -1504,7 +1504,7 @@ { "architecture": "arm64", "buildArgs": { - "REPO": "$(Repo:runtime)" + "REPO": "$(Repo:core-runtime)" }, "dockerfile": "3.1/aspnet/focal/arm64v8", "os": "linux", @@ -1780,7 +1780,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:runtime-deps)" + "REPO": "$(Repo:core-runtime-deps)" }, "dockerfile": "2.1/sdk/alpine3.11/amd64", "os": "linux", @@ -1879,7 +1879,7 @@ }, { "buildArgs": { - "REPO": "$(Repo:aspnet)" + "REPO": "$(Repo:core-aspnet)" }, "dockerfile": "3.1/sdk/nanoserver-1809/amd64", "os": "windows", @@ -1891,7 +1891,7 @@ }, { "buildArgs": { - "REPO": "$(Repo:aspnet)" + "REPO": "$(Repo:core-aspnet)" }, "dockerfile": "3.1/sdk/nanoserver-1903/amd64", "os": "windows", @@ -1903,7 +1903,7 @@ }, { "buildArgs": { - "REPO": "$(Repo:aspnet)" + "REPO": "$(Repo:core-aspnet)" }, "dockerfile": "3.1/sdk/nanoserver-1909/amd64", "os": "windows", @@ -1920,7 +1920,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:aspnet)" + "REPO": "$(Repo:core-aspnet)" }, "dockerfile": "3.1/sdk/alpine3.10/amd64", "os": "linux", @@ -1937,7 +1937,7 @@ "platforms": [ { "buildArgs": { - "REPO": "$(Repo:aspnet)" + "REPO": "$(Repo:core-aspnet)" }, "dockerfile": "3.1/sdk/alpine3.11/amd64", "os": "linux",