diff --git a/.portal-docs/docker-hub/README.aspire-dashboard.md b/.portal-docs/docker-hub/README.aspire-dashboard.md index dbe8423f3f..33e2714f3f 100644 --- a/.portal-docs/docker-hub/README.aspire-dashboard.md +++ b/.portal-docs/docker-hub/README.aspire-dashboard.md @@ -108,7 +108,7 @@ Limits are per-resource. For example, a `MaxLogCount` value of 10,000 configures # Full Tag Listing -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/aspire-dashboard/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.aspire-dashboard.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/dotnet/aspire-dashboard/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.aspire-dashboard.md#full-tag-listing). # Support diff --git a/.portal-docs/docker-hub/README.aspnet.md b/.portal-docs/docker-hub/README.aspnet.md index 94f28807b3..18316b2706 100644 --- a/.portal-docs/docker-hub/README.aspnet.md +++ b/.portal-docs/docker-hub/README.aspnet.md @@ -76,7 +76,7 @@ For more information, see the [composite images section in the Image Variants do # Full Tag Listing -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/aspnet/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.aspnet.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/dotnet/aspnet/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.aspnet.md#full-tag-listing). # Support diff --git a/.portal-docs/docker-hub/README.monitor-base.md b/.portal-docs/docker-hub/README.monitor-base.md index 552bf98229..34696f62b7 100644 --- a/.portal-docs/docker-hub/README.monitor-base.md +++ b/.portal-docs/docker-hub/README.monitor-base.md @@ -43,7 +43,7 @@ The following Dockerfiles demonstrate how you can use this base image to build a # Full Tag Listing -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/monitor/base/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.monitor-base.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/base/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.monitor-base.md#full-tag-listing). # Support diff --git a/.portal-docs/docker-hub/README.monitor.md b/.portal-docs/docker-hub/README.monitor.md index e737e17aa8..2402775231 100644 --- a/.portal-docs/docker-hub/README.monitor.md +++ b/.portal-docs/docker-hub/README.monitor.md @@ -44,7 +44,7 @@ See [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how to # Full Tag Listing -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/monitor/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.monitor.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.monitor.md#full-tag-listing). # Support diff --git a/.portal-docs/docker-hub/README.runtime-deps.md b/.portal-docs/docker-hub/README.runtime-deps.md index 6a8519d106..ae2727115e 100644 --- a/.portal-docs/docker-hub/README.runtime-deps.md +++ b/.portal-docs/docker-hub/README.runtime-deps.md @@ -58,7 +58,7 @@ They contain the following features: # Full Tag Listing -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/runtime-deps/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.runtime-deps.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/dotnet/runtime-deps/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.runtime-deps.md#full-tag-listing). # Support diff --git a/.portal-docs/docker-hub/README.runtime.md b/.portal-docs/docker-hub/README.runtime.md index e6afa7707a..85ffd9d2e1 100644 --- a/.portal-docs/docker-hub/README.runtime.md +++ b/.portal-docs/docker-hub/README.runtime.md @@ -65,7 +65,7 @@ They contain the following features: # Full Tag Listing -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/runtime/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.runtime.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/dotnet/runtime/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.runtime.md#full-tag-listing). # Support diff --git a/.portal-docs/docker-hub/README.samples.md b/.portal-docs/docker-hub/README.samples.md index 17c7e8e096..cc93ea8fba 100644 --- a/.portal-docs/docker-hub/README.samples.md +++ b/.portal-docs/docker-hub/README.samples.md @@ -80,7 +80,7 @@ They contain the following features: # Full Tag Listing -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/samples/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/dotnet/samples/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.samples.md#full-tag-listing). # Support diff --git a/.portal-docs/docker-hub/README.sdk.md b/.portal-docs/docker-hub/README.sdk.md index 1dad81f279..31fb7ea518 100644 --- a/.portal-docs/docker-hub/README.sdk.md +++ b/.portal-docs/docker-hub/README.sdk.md @@ -61,7 +61,7 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/ # Full Tag Listing -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/dotnet/sdk/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.sdk.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/dotnet/sdk/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/main/README.sdk.md#full-tag-listing). # Support diff --git a/.portal-docs/mar/README.aspire-dashboard.portal.md b/.portal-docs/mar/README.aspire-dashboard.portal.md index 0a4d0b4f8a..6202b665ee 100644 --- a/.portal-docs/mar/README.aspire-dashboard.portal.md +++ b/.portal-docs/mar/README.aspire-dashboard.portal.md @@ -14,18 +14,18 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori .NET: * [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET -* [dotnet/sdk](https://mcr.microsoft.com/product/dotnet/sdk/about): .NET SDK -* [dotnet/aspnet](https://mcr.microsoft.com/product/dotnet/aspnet/about): ASP.NET Core Runtime -* [dotnet/runtime](https://mcr.microsoft.com/product/dotnet/runtime/about): .NET Runtime -* [dotnet/runtime-deps](https://mcr.microsoft.com/product/dotnet/runtime-deps/about): .NET Runtime Dependencies -* [dotnet/monitor](https://mcr.microsoft.com/product/dotnet/monitor/about): .NET Monitor Tool -* [dotnet/nightly/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/nightly/aspire-dashboard/about): Aspire Dashboard (Preview) -* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples +* [dotnet/sdk](https://mcr.microsoft.com/artifact/mar/dotnet/sdk/about): .NET SDK +* [dotnet/aspnet](https://mcr.microsoft.com/artifact/mar/dotnet/aspnet/about): ASP.NET Core Runtime +* [dotnet/runtime](https://mcr.microsoft.com/artifact/mar/dotnet/runtime/about): .NET Runtime +* [dotnet/runtime-deps](https://mcr.microsoft.com/artifact/mar/dotnet/runtime-deps/about): .NET Runtime Dependencies +* [dotnet/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/about): .NET Monitor Tool +* [dotnet/nightly/aspire-dashboard](https://mcr.microsoft.com/artifact/mar/dotnet/nightly/aspire-dashboard/about): Aspire Dashboard (Preview) +* [dotnet/samples](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about): .NET Samples .NET Framework: * [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework, ASP.NET and WCF -* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/samples](https://mcr.microsoft.com/artifact/mar/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples ## Usage diff --git a/.portal-docs/mar/README.aspnet.portal.md b/.portal-docs/mar/README.aspnet.portal.md index 72fd765991..8f42d4a1be 100644 --- a/.portal-docs/mar/README.aspnet.portal.md +++ b/.portal-docs/mar/README.aspnet.portal.md @@ -18,18 +18,18 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori .NET: * [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET -* [dotnet/sdk](https://mcr.microsoft.com/product/dotnet/sdk/about): .NET SDK -* [dotnet/runtime](https://mcr.microsoft.com/product/dotnet/runtime/about): .NET Runtime -* [dotnet/runtime-deps](https://mcr.microsoft.com/product/dotnet/runtime-deps/about): .NET Runtime Dependencies -* [dotnet/monitor](https://mcr.microsoft.com/product/dotnet/monitor/about): .NET Monitor Tool -* [dotnet/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/aspire-dashboard/about): Aspire Dashboard -* [dotnet/nightly/aspnet](https://mcr.microsoft.com/product/dotnet/nightly/aspnet/about): ASP.NET Core Runtime (Preview) -* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples +* [dotnet/sdk](https://mcr.microsoft.com/artifact/mar/dotnet/sdk/about): .NET SDK +* [dotnet/runtime](https://mcr.microsoft.com/artifact/mar/dotnet/runtime/about): .NET Runtime +* [dotnet/runtime-deps](https://mcr.microsoft.com/artifact/mar/dotnet/runtime-deps/about): .NET Runtime Dependencies +* [dotnet/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/about): .NET Monitor Tool +* [dotnet/aspire-dashboard](https://mcr.microsoft.com/artifact/mar/dotnet/aspire-dashboard/about): Aspire Dashboard +* [dotnet/nightly/aspnet](https://mcr.microsoft.com/artifact/mar/dotnet/nightly/aspnet/about): ASP.NET Core Runtime (Preview) +* [dotnet/samples](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about): .NET Samples .NET Framework: * [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework, ASP.NET and WCF -* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/samples](https://mcr.microsoft.com/artifact/mar/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples ## Usage @@ -37,7 +37,7 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/main/samp ### Container sample: Run a web application -You can quickly run a container with a pre-built [.NET Docker image](https://mcr.microsoft.com/product/dotnet/samples/about), based on the [ASP.NET Core sample](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/README.md). +You can quickly run a container with a pre-built [.NET Docker image](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about), based on the [ASP.NET Core sample](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/README.md). Type the following command to run a sample web application: diff --git a/.portal-docs/mar/README.monitor-base.portal.md b/.portal-docs/mar/README.monitor-base.portal.md index 1b2f1e1120..9657f57a38 100644 --- a/.portal-docs/mar/README.monitor-base.portal.md +++ b/.portal-docs/mar/README.monitor-base.portal.md @@ -2,7 +2,7 @@ This image contains the base installation of .NET Monitor, a diagnostic tool for capturing diagnostic artifacts (such as dumps and traces) in an operator-driven or automated manner. This tool is an ASP.NET application that hosts a web API for inspecting .NET processes and collecting diagnostic artifacts. -This image only provides the base functionality of the .NET Monitor tool; it is only meant to be used as a base image upon which .NET Monitor extensions are installed. If you are looking for the full feature set that is provided by the .NET Monitor global tool (including the egress capabilities), see the [dotnet/monitor](https://mcr.microsoft.com/product/dotnet/monitor/about) image. +This image only provides the base functionality of the .NET Monitor tool; it is only meant to be used as a base image upon which .NET Monitor extensions are installed. If you are looking for the full feature set that is provided by the .NET Monitor global tool (including the egress capabilities), see the [dotnet/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/about) image. Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categories/announcements) for Docker-related .NET announcements. @@ -18,19 +18,19 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori .NET: * [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET -* [dotnet/sdk](https://mcr.microsoft.com/product/dotnet/sdk/about): .NET SDK -* [dotnet/aspnet](https://mcr.microsoft.com/product/dotnet/aspnet/about): ASP.NET Core Runtime -* [dotnet/runtime](https://mcr.microsoft.com/product/dotnet/runtime/about): .NET Runtime -* [dotnet/runtime-deps](https://mcr.microsoft.com/product/dotnet/runtime-deps/about): .NET Runtime Dependencies -* [dotnet/monitor](https://mcr.microsoft.com/product/dotnet/monitor/about): .NET Monitor Tool -* [dotnet/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/aspire-dashboard/about): Aspire Dashboard -* [dotnet/nightly/monitor/base](https://mcr.microsoft.com/product/dotnet/nightly/monitor/base/about): .NET Monitor Base (Preview) -* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples +* [dotnet/sdk](https://mcr.microsoft.com/artifact/mar/dotnet/sdk/about): .NET SDK +* [dotnet/aspnet](https://mcr.microsoft.com/artifact/mar/dotnet/aspnet/about): ASP.NET Core Runtime +* [dotnet/runtime](https://mcr.microsoft.com/artifact/mar/dotnet/runtime/about): .NET Runtime +* [dotnet/runtime-deps](https://mcr.microsoft.com/artifact/mar/dotnet/runtime-deps/about): .NET Runtime Dependencies +* [dotnet/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/about): .NET Monitor Tool +* [dotnet/aspire-dashboard](https://mcr.microsoft.com/artifact/mar/dotnet/aspire-dashboard/about): Aspire Dashboard +* [dotnet/nightly/monitor/base](https://mcr.microsoft.com/artifact/mar/dotnet/nightly/monitor/base/about): .NET Monitor Base (Preview) +* [dotnet/samples](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about): .NET Samples .NET Framework: * [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework, ASP.NET and WCF -* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/samples](https://mcr.microsoft.com/artifact/mar/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples ## Usage diff --git a/.portal-docs/mar/README.monitor.portal.md b/.portal-docs/mar/README.monitor.portal.md index cdbd93c097..a9182fb58f 100644 --- a/.portal-docs/mar/README.monitor.portal.md +++ b/.portal-docs/mar/README.monitor.portal.md @@ -18,19 +18,19 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori .NET: * [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET -* [dotnet/sdk](https://mcr.microsoft.com/product/dotnet/sdk/about): .NET SDK -* [dotnet/aspnet](https://mcr.microsoft.com/product/dotnet/aspnet/about): ASP.NET Core Runtime -* [dotnet/runtime](https://mcr.microsoft.com/product/dotnet/runtime/about): .NET Runtime -* [dotnet/runtime-deps](https://mcr.microsoft.com/product/dotnet/runtime-deps/about): .NET Runtime Dependencies -* [dotnet/monitor/base](https://mcr.microsoft.com/product/dotnet/monitor/base/about): .NET Monitor Base -* [dotnet/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/aspire-dashboard/about): Aspire Dashboard -* [dotnet/nightly/monitor](https://mcr.microsoft.com/product/dotnet/nightly/monitor/about): .NET Monitor Tool (Preview) -* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples +* [dotnet/sdk](https://mcr.microsoft.com/artifact/mar/dotnet/sdk/about): .NET SDK +* [dotnet/aspnet](https://mcr.microsoft.com/artifact/mar/dotnet/aspnet/about): ASP.NET Core Runtime +* [dotnet/runtime](https://mcr.microsoft.com/artifact/mar/dotnet/runtime/about): .NET Runtime +* [dotnet/runtime-deps](https://mcr.microsoft.com/artifact/mar/dotnet/runtime-deps/about): .NET Runtime Dependencies +* [dotnet/monitor/base](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/base/about): .NET Monitor Base +* [dotnet/aspire-dashboard](https://mcr.microsoft.com/artifact/mar/dotnet/aspire-dashboard/about): Aspire Dashboard +* [dotnet/nightly/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/nightly/monitor/about): .NET Monitor Tool (Preview) +* [dotnet/samples](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about): .NET Samples .NET Framework: * [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework, ASP.NET and WCF -* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/samples](https://mcr.microsoft.com/artifact/mar/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples ## Usage diff --git a/.portal-docs/mar/README.runtime-deps.portal.md b/.portal-docs/mar/README.runtime-deps.portal.md index a1ba33bc8e..3aaeaf11f0 100644 --- a/.portal-docs/mar/README.runtime-deps.portal.md +++ b/.portal-docs/mar/README.runtime-deps.portal.md @@ -18,18 +18,18 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori .NET: * [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET -* [dotnet/sdk](https://mcr.microsoft.com/product/dotnet/sdk/about): .NET SDK -* [dotnet/aspnet](https://mcr.microsoft.com/product/dotnet/aspnet/about): ASP.NET Core Runtime -* [dotnet/runtime](https://mcr.microsoft.com/product/dotnet/runtime/about): .NET Runtime -* [dotnet/monitor](https://mcr.microsoft.com/product/dotnet/monitor/about): .NET Monitor Tool -* [dotnet/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/aspire-dashboard/about): Aspire Dashboard -* [dotnet/nightly/runtime-deps](https://mcr.microsoft.com/product/dotnet/nightly/runtime-deps/about): .NET Runtime Dependencies (Preview) -* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples +* [dotnet/sdk](https://mcr.microsoft.com/artifact/mar/dotnet/sdk/about): .NET SDK +* [dotnet/aspnet](https://mcr.microsoft.com/artifact/mar/dotnet/aspnet/about): ASP.NET Core Runtime +* [dotnet/runtime](https://mcr.microsoft.com/artifact/mar/dotnet/runtime/about): .NET Runtime +* [dotnet/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/about): .NET Monitor Tool +* [dotnet/aspire-dashboard](https://mcr.microsoft.com/artifact/mar/dotnet/aspire-dashboard/about): Aspire Dashboard +* [dotnet/nightly/runtime-deps](https://mcr.microsoft.com/artifact/mar/dotnet/nightly/runtime-deps/about): .NET Runtime Dependencies (Preview) +* [dotnet/samples](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about): .NET Samples .NET Framework: * [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework, ASP.NET and WCF -* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/samples](https://mcr.microsoft.com/artifact/mar/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples ## Usage diff --git a/.portal-docs/mar/README.runtime.portal.md b/.portal-docs/mar/README.runtime.portal.md index 8affb642ed..932620a2ff 100644 --- a/.portal-docs/mar/README.runtime.portal.md +++ b/.portal-docs/mar/README.runtime.portal.md @@ -18,18 +18,18 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori .NET: * [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET -* [dotnet/sdk](https://mcr.microsoft.com/product/dotnet/sdk/about): .NET SDK -* [dotnet/aspnet](https://mcr.microsoft.com/product/dotnet/aspnet/about): ASP.NET Core Runtime -* [dotnet/runtime-deps](https://mcr.microsoft.com/product/dotnet/runtime-deps/about): .NET Runtime Dependencies -* [dotnet/monitor](https://mcr.microsoft.com/product/dotnet/monitor/about): .NET Monitor Tool -* [dotnet/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/aspire-dashboard/about): Aspire Dashboard -* [dotnet/nightly/runtime](https://mcr.microsoft.com/product/dotnet/nightly/runtime/about): .NET Runtime (Preview) -* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples +* [dotnet/sdk](https://mcr.microsoft.com/artifact/mar/dotnet/sdk/about): .NET SDK +* [dotnet/aspnet](https://mcr.microsoft.com/artifact/mar/dotnet/aspnet/about): ASP.NET Core Runtime +* [dotnet/runtime-deps](https://mcr.microsoft.com/artifact/mar/dotnet/runtime-deps/about): .NET Runtime Dependencies +* [dotnet/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/about): .NET Monitor Tool +* [dotnet/aspire-dashboard](https://mcr.microsoft.com/artifact/mar/dotnet/aspire-dashboard/about): Aspire Dashboard +* [dotnet/nightly/runtime](https://mcr.microsoft.com/artifact/mar/dotnet/nightly/runtime/about): .NET Runtime (Preview) +* [dotnet/samples](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about): .NET Samples .NET Framework: * [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework, ASP.NET and WCF -* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/samples](https://mcr.microsoft.com/artifact/mar/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples ## Usage @@ -37,7 +37,7 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/main/samp ### Container sample: Run a simple application -You can quickly run a container with a pre-built [.NET Docker image](https://mcr.microsoft.com/product/dotnet/samples/about), based on the [.NET console sample](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/README.md). +You can quickly run a container with a pre-built [.NET Docker image](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about), based on the [.NET console sample](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/README.md). Type the following command to run a sample console application: diff --git a/.portal-docs/mar/README.samples.portal.md b/.portal-docs/mar/README.samples.portal.md index d20e1a6413..0258c9583a 100644 --- a/.portal-docs/mar/README.samples.portal.md +++ b/.portal-docs/mar/README.samples.portal.md @@ -18,17 +18,17 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori .NET: * [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET -* [dotnet/sdk](https://mcr.microsoft.com/product/dotnet/sdk/about): .NET SDK -* [dotnet/aspnet](https://mcr.microsoft.com/product/dotnet/aspnet/about): ASP.NET Core Runtime -* [dotnet/runtime](https://mcr.microsoft.com/product/dotnet/runtime/about): .NET Runtime -* [dotnet/runtime-deps](https://mcr.microsoft.com/product/dotnet/runtime-deps/about): .NET Runtime Dependencies -* [dotnet/monitor](https://mcr.microsoft.com/product/dotnet/monitor/about): .NET Monitor Tool -* [dotnet/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/aspire-dashboard/about): Aspire Dashboard +* [dotnet/sdk](https://mcr.microsoft.com/artifact/mar/dotnet/sdk/about): .NET SDK +* [dotnet/aspnet](https://mcr.microsoft.com/artifact/mar/dotnet/aspnet/about): ASP.NET Core Runtime +* [dotnet/runtime](https://mcr.microsoft.com/artifact/mar/dotnet/runtime/about): .NET Runtime +* [dotnet/runtime-deps](https://mcr.microsoft.com/artifact/mar/dotnet/runtime-deps/about): .NET Runtime Dependencies +* [dotnet/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/about): .NET Monitor Tool +* [dotnet/aspire-dashboard](https://mcr.microsoft.com/artifact/mar/dotnet/aspire-dashboard/about): Aspire Dashboard .NET Framework: * [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework, ASP.NET and WCF -* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/samples](https://mcr.microsoft.com/artifact/mar/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples ## Usage @@ -36,7 +36,7 @@ The [.NET Docker samples](https://github.com/dotnet/dotnet-docker/blob/main/samp ### Container sample: Run a simple application -You can quickly run a container with a pre-built [.NET Docker image](https://mcr.microsoft.com/product/dotnet/samples/about), based on the [.NET console sample](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/README.md). +You can quickly run a container with a pre-built [.NET Docker image](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about), based on the [.NET console sample](https://github.com/dotnet/dotnet-docker/blob/main/samples/dotnetapp/README.md). Type the following command to run a sample console application: @@ -46,7 +46,7 @@ docker run --rm mcr.microsoft.com/dotnet/samples ### Container sample: Run a web application -You can quickly run a container with a pre-built [.NET Docker image](https://mcr.microsoft.com/product/dotnet/samples/about), based on the [ASP.NET Core sample](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/README.md). +You can quickly run a container with a pre-built [.NET Docker image](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about), based on the [ASP.NET Core sample](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/README.md). Type the following command to run a sample web application: diff --git a/.portal-docs/mar/README.sdk.portal.md b/.portal-docs/mar/README.sdk.portal.md index 575f4eb85d..8df05d77ee 100644 --- a/.portal-docs/mar/README.sdk.portal.md +++ b/.portal-docs/mar/README.sdk.portal.md @@ -24,18 +24,18 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori .NET: * [dotnet](https://mcr.microsoft.com/catalog?search=dotnet): .NET -* [dotnet/aspnet](https://mcr.microsoft.com/product/dotnet/aspnet/about): ASP.NET Core Runtime -* [dotnet/runtime](https://mcr.microsoft.com/product/dotnet/runtime/about): .NET Runtime -* [dotnet/runtime-deps](https://mcr.microsoft.com/product/dotnet/runtime-deps/about): .NET Runtime Dependencies -* [dotnet/monitor](https://mcr.microsoft.com/product/dotnet/monitor/about): .NET Monitor Tool -* [dotnet/aspire-dashboard](https://mcr.microsoft.com/product/dotnet/aspire-dashboard/about): Aspire Dashboard -* [dotnet/nightly/sdk](https://mcr.microsoft.com/product/dotnet/nightly/sdk/about): .NET SDK (Preview) -* [dotnet/samples](https://mcr.microsoft.com/product/dotnet/samples/about): .NET Samples +* [dotnet/aspnet](https://mcr.microsoft.com/artifact/mar/dotnet/aspnet/about): ASP.NET Core Runtime +* [dotnet/runtime](https://mcr.microsoft.com/artifact/mar/dotnet/runtime/about): .NET Runtime +* [dotnet/runtime-deps](https://mcr.microsoft.com/artifact/mar/dotnet/runtime-deps/about): .NET Runtime Dependencies +* [dotnet/monitor](https://mcr.microsoft.com/artifact/mar/dotnet/monitor/about): .NET Monitor Tool +* [dotnet/aspire-dashboard](https://mcr.microsoft.com/artifact/mar/dotnet/aspire-dashboard/about): Aspire Dashboard +* [dotnet/nightly/sdk](https://mcr.microsoft.com/artifact/mar/dotnet/nightly/sdk/about): .NET SDK (Preview) +* [dotnet/samples](https://mcr.microsoft.com/artifact/mar/dotnet/samples/about): .NET Samples .NET Framework: * [dotnet/framework](https://mcr.microsoft.com/catalog?search=dotnet/framework): .NET Framework, ASP.NET and WCF -* [dotnet/framework/samples](https://mcr.microsoft.com/product/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples +* [dotnet/framework/samples](https://mcr.microsoft.com/artifact/mar/dotnet/framework/samples/about): .NET Framework, ASP.NET and WCF Samples ## Usage diff --git a/README.monitor-base.md b/README.monitor-base.md index ea4aef96d1..967cf548e7 100644 --- a/README.monitor-base.md +++ b/README.monitor-base.md @@ -54,12 +54,6 @@ Tags | Dockerfile | OS Version 8.1.3-ubuntu-chiseled-amd64, 8.1-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.1.3-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.3, 8.1, 8 | [Dockerfile](src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.1.3-azurelinux-distroless-amd64, 8.1-azurelinux-distroless-amd64, 8-azurelinux-distroless-amd64, 8.1.3-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 -#### .NET Monitor Preview Tags - -Tags | Dockerfile | OS Version ------------| -------------| ------------- -9.1.0-preview.3-amd64, 9.1-preview-amd64, 9.1.0-preview.3, 9.1-preview, 9-preview | [Dockerfile](src/monitor-base/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 - ### Linux arm64 Tags Tags | Dockerfile | OS Version @@ -68,12 +62,6 @@ Tags | Dockerfile | OS Version 9.0.5-arm64v8, 9.0-arm64v8, 9.0.5, 9.0, 9 | [Dockerfile](src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.1.3-ubuntu-chiseled-arm64v8, 8.1-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.1.3-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.3, 8.1, 8 | [Dockerfile](src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.1.3-azurelinux-distroless-arm64v8, 8.1-azurelinux-distroless-arm64v8, 8-azurelinux-distroless-arm64v8, 8.1.3-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 - -#### .NET Monitor Preview Tags - -Tags | Dockerfile | OS Version ------------| -------------| ------------- -9.1.0-preview.3-arm64v8, 9.1-preview-arm64v8, 9.1.0-preview.3, 9.1-preview, 9-preview | [Dockerfile](src/monitor-base/9.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/monitor/base/tags/list) for all supported and unsupported tags.* diff --git a/README.monitor.md b/README.monitor.md index dfdab8581f..d5c22bfcc4 100644 --- a/README.monitor.md +++ b/README.monitor.md @@ -55,12 +55,6 @@ Tags | Dockerfile | OS Version 8.1.3-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.3, 8.1, 8 | [Dockerfile](src/monitor/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 8.1.3-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 -#### .NET Monitor Preview Tags - -Tags | Dockerfile | OS Version ------------| -------------| ------------- -9.1.0-preview.3, 9.1-preview, 9-preview | [Dockerfile](src/monitor/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 - ### Linux arm64 Tags Tags | Dockerfile | OS Version @@ -69,12 +63,6 @@ Tags | Dockerfile | OS Version 9.0.5, 9.0, 9 | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.1.3-ubuntu-chiseled, 8.1-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.3, 8.1, 8 | [Dockerfile](src/monitor/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 8.1.3-azurelinux-distroless, 8.1-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](src/monitor/8.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 - -#### .NET Monitor Preview Tags - -Tags | Dockerfile | OS Version ------------| -------------| ------------- -9.1.0-preview.3, 9.1-preview, 9-preview | [Dockerfile](src/monitor/9.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/monitor/tags/list) for all supported and unsupported tags.* diff --git a/documentation/supported-platforms.md b/documentation/supported-platforms.md index 51e175d0bb..bd01fb44e2 100644 --- a/documentation/supported-platforms.md +++ b/documentation/supported-platforms.md @@ -44,7 +44,7 @@ Windows Server support timelines can be found here: [Windows Server release info - Nano Server - all versions in the [Mainstream Support](https://learn.microsoft.com/lifecycle/policies/fixed#mainstream-support) phase. - Windows Server Core - all versions in the [Mainstream Support](https://learn.microsoft.com/lifecycle/policies/fixed#mainstream-support) phase. -For scenarios where the official .NET images don't meet your needs, you will need to manage your own custom .NET images based on [Windows Server Core](https://mcr.microsoft.com/product/windows/servercore/about) or [Windows Server](https://mcr.microsoft.com/product/windows/server/about). +For scenarios where the official .NET images don't meet your needs, you will need to manage your own custom .NET images based on [Windows Server Core](https://mcr.microsoft.com/artifact/mar/windows/servercore/about) or [Windows Server](https://mcr.microsoft.com/artifact/mar/windows/server/about). ## Architectures diff --git a/eng/mcr-tags-metadata-templates/monitor-base-tags.yml b/eng/mcr-tags-metadata-templates/monitor-base-tags.yml index abf53c075e..993fa7e17b 100644 --- a/eng/mcr-tags-metadata-templates/monitor-base-tags.yml +++ b/eng/mcr-tags-metadata-templates/monitor-base-tags.yml @@ -1,6 +1,5 @@ $(McrTagsYmlRepo:monitor-base) $(McrTagsYmlTagGroup:10.0) -$(McrTagsYmlTagGroup:9.1-preview|.NET Monitor Preview Tags) $(McrTagsYmlTagGroup:9.0) $(McrTagsYmlTagGroup:8.1-ubuntu-chiseled) $(McrTagsYmlTagGroup:8.1-azurelinux-distroless) diff --git a/eng/mcr-tags-metadata-templates/monitor-tags.yml b/eng/mcr-tags-metadata-templates/monitor-tags.yml index 703721caae..8f9ff913a2 100644 --- a/eng/mcr-tags-metadata-templates/monitor-tags.yml +++ b/eng/mcr-tags-metadata-templates/monitor-tags.yml @@ -1,6 +1,5 @@ $(McrTagsYmlRepo:monitor) $(McrTagsYmlTagGroup:10.0) -$(McrTagsYmlTagGroup:9.1-preview|.NET Monitor Preview Tags) $(McrTagsYmlTagGroup:9.0) $(McrTagsYmlTagGroup:8.1-ubuntu-chiseled) $(McrTagsYmlTagGroup:8.1-azurelinux-distroless) diff --git a/eng/pipelines/pipelines/update-dependencies.yml b/eng/pipelines/pipelines/update-dependencies.yml index a1c3662e03..7bf3437e9d 100644 --- a/eng/pipelines/pipelines/update-dependencies.yml +++ b/eng/pipelines/pipelines/update-dependencies.yml @@ -3,18 +3,29 @@ parameters: - name: official type: boolean default: false -# BAR build channel to read .NET versions from -- name: channel +# BAR channel to read .NET VMR versions from +# Find full list of channels at https://aka.ms/bar +- name: vmrChannel type: string default: "" -# .NET image components to update +# BAR channel to read Aspire versions from +- name: aspireChannel + type: string + default: "" +# .NET image components to update. This should be a list of strings. +# 'stringList' is not a supported type for parameters in templates, so we need use 'object' instead. +# https://learn.microsoft.com/azure/devops/pipelines/process/runtime-parameters#parameter-data-types - name: tools type: object - default: - - "chisel" - - "rocks-toolbox" - - "syft" - - "mingit" + default: [] +# Whether or not to try and update .NET versions according to the channel parameter +- name: updateDotnet + type: boolean + default: true +# Whether or not to try and update the Aspire Dashboard version according to the channel parameter +- name: updateAspire + type: boolean + default: true # Additional authentication arguments to pass to update-dependencies - name: gitHubAuthArgs type: string @@ -28,23 +39,43 @@ extends: displayName: Update dependencies jobs: - - template: /eng/pipelines/jobs/update-dependency.yml@self - parameters: - dependencyName: dotnet - updateSteps: - - task: AzureCLI@2 - displayName: Update Dotnet - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: "pscore" - scriptLocation: "inlineScript" - inlineScript: >- - dotnet run --project eng/update-dependencies/update-dependencies.csproj -- - from-channel - ${{ parameters.channel }} - https://github.com/dotnet/dotnet - --version-source-name 'dotnet/dotnet' - ${{ parameters.gitHubAuthArgs }} + - ${{ if parameters.updateDotnet }}: + - template: /eng/pipelines/jobs/update-dependency.yml@self + parameters: + dependencyName: dotnet + updateSteps: + - task: AzureCLI@2 + displayName: Update .NET + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: "pscore" + scriptLocation: "inlineScript" + inlineScript: >- + dotnet run --project eng/update-dependencies/update-dependencies.csproj -- + from-channel + ${{ parameters.vmrChannel }} + https://github.com/dotnet/dotnet + --version-source-name 'dotnet/dotnet' + ${{ parameters.gitHubAuthArgs }} + + - ${{ if parameters.updateAspire }}: + - template: /eng/pipelines/jobs/update-dependency.yml@self + parameters: + dependencyName: aspire + updateSteps: + - task: AzureCLI@2 + displayName: Update Aspire + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: "pscore" + scriptLocation: "inlineScript" + inlineScript: >- + dotnet run --project eng/update-dependencies/update-dependencies.csproj -- + from-channel + ${{ parameters.aspireChannel }} + https://github.com/dotnet/aspire + --version-source-name 'dotnet/aspire' + ${{ parameters.gitHubAuthArgs }} - ${{ each tool in parameters.tools }}: - template: /eng/pipelines/jobs/update-dependency.yml@self diff --git a/eng/pipelines/update-dependencies-official.yml b/eng/pipelines/update-dependencies-official.yml index 44e66df6bd..828fda6bb0 100644 --- a/eng/pipelines/update-dependencies-official.yml +++ b/eng/pipelines/update-dependencies-official.yml @@ -13,6 +13,33 @@ parameters: displayName: Skip Pull Request type: boolean default: false + - name: updateDotnet + displayName: Update .NET? + type: boolean + # Updates are disabled until .NET 11 Alpha images are added. + # Re-enable when https://github.com/dotnet/dotnet-docker/issues/6824 is resolved. + default: false + - name: updateAspire + displayName: Update Aspire Dashboard? + type: boolean + default: true + # This parameter will show up as a multi-select dropdown when queueing the pipeline + - name: tools + type: stringList + displayName: Tools to update + values: + - "chisel" + - "rocks-toolbox" + - "syft" + - "mingit" + # Keep the default values in sync with allowed values so that the scheduled + # pipeline runs always try to update all tools + default: + # Disabled due to https://github.com/dotnet/dotnet-docker/issues/6774 - re-enable when fixed. + # - "chisel" + - "rocks-toolbox" + - "syft" + - "mingit" variables: - template: /eng/docker-tools/templates/variables/dotnet/common.yml@self @@ -22,7 +49,11 @@ variables: extends: template: /eng/pipelines/pipelines/update-dependencies.yml@self parameters: - channel: $(channel) + updateDotnet: ${{ parameters.updateDotnet }} + vmrChannel: $(vmrChannel) + updateAspire: ${{ parameters.updateAspire }} + aspireChannel: $(aspireChannel) + tools: ${{ parameters.tools }} ${{ if ne(parameters.skipPullRequest, true) }}: gitHubAuthArgs: >- --user $(dotnetDockerBot.userName) diff --git a/eng/pipelines/update-dependencies-unofficial.yml b/eng/pipelines/update-dependencies-unofficial.yml index ed5dbdbde1..2b0d1ad1ff 100644 --- a/eng/pipelines/update-dependencies-unofficial.yml +++ b/eng/pipelines/update-dependencies-unofficial.yml @@ -2,10 +2,38 @@ trigger: none pr: none parameters: -- name: channel - displayName: BAR build channel to read .NET versions from (see aka.ms/bar) +- name: updateDotnet + displayName: Update .NET? + type: boolean + default: true +- name: vmrChannel + displayName: .NET VMR build channel (see aka.ms/bar) type: string default: "" +- name: updateAspire + displayName: Update Aspire Dashboard? + type: boolean + default: false +- name: aspireChannel + displayName: Aspire build channel (see aka.ms/bar) + type: string + default: "" +# This parameter will show up as a multi-select dropdown when queueing the pipeline +- name: tools + type: stringList + displayName: Tools to update + values: + - "chisel" + - "rocks-toolbox" + - "syft" + - "mingit" + # Keep the default values in sync with allowed values so that the scheduled + # pipeline runs always try to update all tools + default: + - "chisel" + - "rocks-toolbox" + - "syft" + - "mingit" variables: - template: /eng/docker-tools/templates/variables/dotnet/common.yml@self @@ -14,4 +42,7 @@ variables: extends: template: /eng/pipelines/pipelines/update-dependencies.yml@self parameters: - channel: ${{ parameters.channel }} + vmrChannel: ${{ parameters.vmrChannel }} + aspireChannel: ${{ parameters.aspireChannel }} + updateDotnet: ${{ parameters.updateDotnet }} + tools: ${{ parameters.tools }} diff --git a/eng/readme-templates/DefaultLayout.md b/eng/readme-templates/DefaultLayout.md index c07f0b0e8a..90d6567043 100644 --- a/eng/readme-templates/DefaultLayout.md +++ b/eng/readme-templates/DefaultLayout.md @@ -28,6 +28,6 @@ if !IS_PRODUCT_FAMILY:{{InsertTemplate("FeaturedTags.md", commonArgs)}} {{if ARGS["readme-host"] = "github": *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/{{REPO}}/tags/list) for all supported and unsupported tags.* ^elif ARGS["readme-host"] = "dockerhub": -View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/product/{{REPO}}/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/{{if isNightlyRepo:nightly^else:main}}/README.{{readmeRepoName}}.md#full-tag-listing). +View the current tags at the [Microsoft Artifact Registry portal](https://mcr.microsoft.com/artifact/mar/{{REPO}}/tags) or on [GitHub](https://github.com/dotnet/dotnet-docker/blob/{{if isNightlyRepo:nightly^else:main}}/README.{{readmeRepoName}}.md#full-tag-listing). }}}} {{InsertTemplate("Support.md", commonArgs)}} diff --git a/eng/readme-templates/Url.md b/eng/readme-templates/Url.md index 50b6c1c8b5..e5af2b8ba7 100644 --- a/eng/readme-templates/Url.md +++ b/eng/readme-templates/Url.md @@ -22,7 +22,7 @@ when(readmeHost = "mar", when(isProductFamily, cat("https://mcr.microsoft.com/catalog?search=", repo), - cat("https://mcr.microsoft.com/product/", repo, "/about")), + cat("https://mcr.microsoft.com/artifact/mar/", repo, "/about")), when(readmeHost = "github", when(useRelativeLink, cat("./", readmeFileName), diff --git a/eng/update-dependencies/AspireBuildUpdaterService.cs b/eng/update-dependencies/AspireBuildUpdaterService.cs index bd7d178ef1..247f62a8b0 100644 --- a/eng/update-dependencies/AspireBuildUpdaterService.cs +++ b/eng/update-dependencies/AspireBuildUpdaterService.cs @@ -56,11 +56,16 @@ public async Task UpdateFrom(Build build, CreatePullRequestOptions pullRequ var version = dashboardAssets.First().Version; var majorMinorVersion = VersionHelper.ResolveMajorMinorVersion(version); + // Known issue: Aspire Dashboard builds are always "preview 1". + // Passing in isStableRelease here keeps us from setting the product + // version to the full build version with the "-preview.1" suffix. + var productVersion = VersionHelper.ResolveProductVersion(version, isStableRelease: true); + List variableUpdates = [ new VariableUpdateInfo("aspire-dashboard|build-version", version), - new VariableUpdateInfo("aspire-dashboard|product-version", VersionHelper.ResolveProductVersion(version)), - new VariableUpdateInfo("aspire-dashboard|fixed-tag", VersionHelper.ResolveProductVersion(version)), + new VariableUpdateInfo("aspire-dashboard|product-version", productVersion), + new VariableUpdateInfo("aspire-dashboard|fixed-tag", productVersion), new VariableUpdateInfo("aspire-dashboard|minor-tag", majorMinorVersion.ToString(2)), new VariableUpdateInfo("aspire-dashboard|major-tag", majorMinorVersion.Major.ToString()), ]; diff --git a/eng/update-dependencies/FromStagingPipelineCommand.cs b/eng/update-dependencies/FromStagingPipelineCommand.cs index 0ee88bca60..d90e3ae1b9 100644 --- a/eng/update-dependencies/FromStagingPipelineCommand.cs +++ b/eng/update-dependencies/FromStagingPipelineCommand.cs @@ -146,14 +146,18 @@ public override async Task ExecuteAsync(FromStagingPipelineOptions options) return exitCode; } - var commitMessage = $"Update .NET {majorMinorVersionString} to {productVersions["sdk"]} SDK / {productVersions["runtime"]} Runtime"; + var commitMessage = releaseConfig switch + { + { SdkOnly: true } => $"Update .NET {majorMinorVersionString} SDK to {productVersions["sdk"]}", + _ => $"Update .NET {majorMinorVersionString} to {productVersions["sdk"]} SDK / {productVersions["runtime"]} Runtime", + }; + var prTitle = $"[{options.TargetBranch}] {commitMessage}"; + var newVersionsList = productVersions.Select(kvp => $"- {kvp.Key.ToUpper()}: {kvp.Value}"); var prBody = $""" This pull request updates .NET {majorMinorVersionString} to the following versions: - - SDK: {productVersions["sdk"]} - - Runtime: {productVersions["runtime"]} - - ASP.NET Core: {productVersions["aspnet"]} + {string.Join(Environment.NewLine, newVersionsList)} These versions are from .NET staging pipeline run [#{options.StagingPipelineRunId}]({buildUrl}). """; @@ -246,6 +250,9 @@ await git.Remote.CreatePullRequestAsync(new( createPullRequest = async (commitMessage, prTitle, prBody) => { logger.LogInformation("Skipping commit and pull request creation in {Mode} mode.", options.Mode); + logger.LogInformation("Commit message: {CommitMessage}", commitMessage); + logger.LogInformation("Pull request title: {PullRequestTitle}", prTitle); + logger.LogInformation("Pull request body:\n{PullRequestBody}", prBody); }; } diff --git a/manifest.json b/manifest.json index 54b3a4794b..e7c5f39321 100644 --- a/manifest.json +++ b/manifest.json @@ -9040,44 +9040,6 @@ } ] }, - { - "productVersion": "$(monitor|9.1|product-version)", - "sharedTags": { - "$(monitor|9.1|fixed-tag)": {}, - "$(monitor|9.1|minor-tag)": {}, - "$(monitor|9|major-preview-tag)": {} - }, - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:aspnet)" - }, - "dockerfile": "src/monitor-base/9.1/azurelinux-distroless/amd64", - "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux", - "os": "linux", - "osVersion": "azurelinux3.0-distroless", - "tags": { - "$(monitor|9.1|fixed-tag)-amd64": {}, - "$(monitor|9.1|minor-tag)-amd64": {} - } - }, - { - "architecture": "arm64", - "buildArgs": { - "REPO": "$(Repo:aspnet)" - }, - "dockerfile": "src/monitor-base/9.1/azurelinux-distroless/arm64v8", - "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux", - "os": "linux", - "osVersion": "azurelinux3.0-distroless", - "tags": { - "$(monitor|9.1|fixed-tag)-arm64v8": {}, - "$(monitor|9.1|minor-tag)-arm64v8": {} - }, - "variant": "v8" - } - ] - }, { "productVersion": "$(monitor|10.0|product-version)", "sharedTags": { @@ -9300,52 +9262,6 @@ } ] }, - { - "productVersion": "$(monitor|9.1|product-version)", - "sharedTags": { - "$(monitor|9.1|fixed-tag)": {}, - "$(monitor|9.1|minor-tag)": {}, - "$(monitor|9|major-preview-tag)": {} - }, - "platforms": [ - { - "buildArgs": { - "REPO": "$(Repo:monitor-base)" - }, - "dockerfile": "src/monitor/9.1/azurelinux-distroless/amd64", - "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux", - "os": "linux", - "osVersion": "azurelinux3.0-distroless", - "tags": { - "$(monitor|9.1|fixed-tag)-amd64": { - "docType": "Undocumented" - }, - "$(monitor|9.1|minor-tag)-amd64": { - "docType": "Undocumented" - } - } - }, - { - "architecture": "arm64", - "buildArgs": { - "REPO": "$(Repo:monitor-base)" - }, - "dockerfile": "src/monitor/9.1/azurelinux-distroless/arm64v8", - "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux", - "os": "linux", - "osVersion": "azurelinux3.0-distroless", - "tags": { - "$(monitor|9.1|fixed-tag)-arm64v8": { - "docType": "Undocumented" - }, - "$(monitor|9.1|minor-tag)-arm64v8": { - "docType": "Undocumented" - } - }, - "variant": "v8" - } - ] - }, { "productVersion": "$(monitor|10.0|product-version)", "sharedTags": { diff --git a/manifest.versions.json b/manifest.versions.json index 80f6ffd98b..019a660ea2 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -101,8 +101,8 @@ "libssl|jammy": "3", "libssl|noble": "3t64", - "mingit|latest|x64|url": "https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip", - "mingit|latest|x64|sha": "8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072", + "mingit|latest|x64|url": "https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip", + "mingit|latest|x64|sha": "f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2", "mingit|8.0|x64|url": "$(mingit|latest|x64|url)", "mingit|8.0|x64|sha": "$(mingit|latest|x64|sha)", "mingit|9.0|x64|url": "$(mingit|latest|x64|url)", @@ -125,7 +125,6 @@ "monitor-ext-s3storage|8.1|linux|arm64|sha": "e2867556d9a81d8bf7b2e6bf47117135f1a6ce4b93b71222c099ec7e299cc3e74e7a4fb8cfdad3734651de32e3d379e828fefae855df3ed60108e33ed31f0fad", "monitor|9|major-tag": "9", - "monitor|9|major-preview-tag": "9-preview", "monitor|10|major-tag": "10", "monitor|9.0|build-version": "9.0.5", @@ -141,19 +140,6 @@ "monitor-ext-s3storage|9.0|linux|x64|sha": "8fa19f1b002fa3d91571f960d7bb803a38bb81d237f5a44677726ca3b0d65e8231c9bbe1494c84a6998ac1c4dd138290e138eabd36fdf409da311736741d91d4", "monitor-ext-s3storage|9.0|linux|arm64|sha": "60dfe12e76badb3530a0ad0d9b8d58ea059883774f1a671c2702ae35ce2e3212ad9e3acb1134df448a9c7bcfdd264293584b74f02283b57e4a98d0ff0279ac4a", - "monitor|9.1|build-version": "9.1.0-preview.3.25257.5", - "monitor|9.1|product-version": "9.1.0-preview.3", - "monitor|9.1|fixed-tag": "$(monitor|9.1|product-version)", - "monitor|9.1|minor-tag": "9.1-preview", - "monitor|9.1|base-url|main": "$(base-url|public|maintenance|main)", - "monitor|9.1|base-url|nightly": "$(base-url|public|preview|nightly)", - "monitor-base|9.1|linux|x64|sha": "e971e39dde6da0b108803dd8b4e2e64823b69cff489cc24934ea70df1816c0760f516a857b8a4d9e6e469731289376f56f7f2485514cd22408e6daba22c9c1eb", - "monitor-base|9.1|linux|arm64|sha": "1066302878d63c7d836e1222094e556eb53b30e0166cd29f2e9276d02a57d2d23726277fe9faded3376ea818671796ed8f219e8f146cb50f4a30943f8939c579", - "monitor-ext-azureblobstorage|9.1|linux|x64|sha": "e2c45ea3a7adf72d358bb5fecef4efdc59eedf0760921557923766f633d3ae81e85e646a176544d9ffb1bcb763565c6653c199ea53ec73e99aebe88aec8a7bc6", - "monitor-ext-azureblobstorage|9.1|linux|arm64|sha": "88fbc937285b7eb1bfaf2cbe2099b67f714ed625bd44fd61dabfc8f6e6f177d514e2e6af29fe5209ec35ab94876c4ca18119e3aaa74096ee22a6d879409713a9", - "monitor-ext-s3storage|9.1|linux|x64|sha": "82b550ad9432b86ff58f0bb0f959cd52341b2225d3806fd7211b28462bb216b99ddd828fc36146fca2e92c6c545bc6d81c629ee8dd691d69cd2232528b81d48b", - "monitor-ext-s3storage|9.1|linux|arm64|sha": "3854991fe4a6bbbd18f7504d8e4da8ade88133a8db0172facd8a50b8057967fbc8ad5643776c68f04b5bcdd5fd901bc2d298d2007a88a2046261c0cfb57226aa", - "monitor|10.0|build-version": "10.0.0", "monitor|10.0|product-version": "10.0.0", "monitor|10.0|fixed-tag": "$(monitor|10.0|product-version)", @@ -226,7 +212,7 @@ "sdk|10.0|minor-tag": "$(dotnet|10.0|minor-tag)", "syft|repo": "anchore/syft", - "syft|version": "v1.33.0", + "syft|version": "v1.38.0", "syft|tag": "$(syft|version)-debug" } } diff --git a/src/monitor-base/9.1/azurelinux-distroless/amd64/Dockerfile b/src/monitor-base/9.1/azurelinux-distroless/amd64/Dockerfile deleted file mode 100644 index bb3d8b8bd6..0000000000 --- a/src/monitor-base/9.1/azurelinux-distroless/amd64/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/aspnet - -# Installer image -FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer - -RUN tdnf install -y \ - ca-certificates \ - gzip \ - tar \ - && tdnf clean all - -# Retrieve .NET Monitor Base -RUN dotnet_monitor_version=9.1.0-preview.3.25257.5 \ - && curl --fail --show-error --location --output dotnet-monitor-base.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \ - && dotnet_monitor_base_sha512='e971e39dde6da0b108803dd8b4e2e64823b69cff489cc24934ea70df1816c0760f516a857b8a4d9e6e469731289376f56f7f2485514cd22408e6daba22c9c1eb' \ - && echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \ - && mkdir --parents /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-base.tar.gz --directory /app \ - && rm dotnet-monitor-base.tar.gz - - -# .NET Monitor Base image -FROM $REPO:9.0.11-azurelinux3.0-distroless-amd64 - -WORKDIR /app -COPY --from=installer /app . - -ENV \ - # Unset ASPNETCORE_HTTP_PORTS from aspnet base image - ASPNETCORE_HTTP_PORTS= \ - # Disable debugger and profiler diagnostics to avoid diagnosing self. - COMPlus_EnableDiagnostics=0 \ - # Default Filter - DefaultProcess__Filters__0__Key=ProcessId \ - DefaultProcess__Filters__0__Value=1 \ - # Remove Unix Domain Socket before starting diagnostic port server - DiagnosticPort__DeleteEndpointOnStartup=true \ - # Server GC mode - DOTNET_gcServer=1 \ - # Logging: JSON format so that analytic platforms can get discrete entry information - Logging__Console__FormatterName=json \ - # Logging: Use round-trip date/time format without timezone information (always logged in UTC) - Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \ - # Logging: Write timestamps using UTC offset (+0:00) - Logging__Console__FormatterOptions__UseUtcTimestamp=true \ - # Add dotnet-monitor path to front of PATH for easier, prioritized execution - PATH="/app:${PATH}" - -ENTRYPOINT [ "dotnet-monitor" ] -CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ] diff --git a/src/monitor-base/9.1/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor-base/9.1/azurelinux-distroless/arm64v8/Dockerfile deleted file mode 100644 index 366f1f8ef7..0000000000 --- a/src/monitor-base/9.1/azurelinux-distroless/arm64v8/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/aspnet - -# Installer image -FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer - -RUN tdnf install -y \ - ca-certificates \ - gzip \ - tar \ - && tdnf clean all - -# Retrieve .NET Monitor Base -RUN dotnet_monitor_version=9.1.0-preview.3.25257.5 \ - && curl --fail --show-error --location --output dotnet-monitor-base.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \ - && dotnet_monitor_base_sha512='1066302878d63c7d836e1222094e556eb53b30e0166cd29f2e9276d02a57d2d23726277fe9faded3376ea818671796ed8f219e8f146cb50f4a30943f8939c579' \ - && echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \ - && mkdir --parents /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-base.tar.gz --directory /app \ - && rm dotnet-monitor-base.tar.gz - - -# .NET Monitor Base image -FROM $REPO:9.0.11-azurelinux3.0-distroless-arm64v8 - -WORKDIR /app -COPY --from=installer /app . - -ENV \ - # Unset ASPNETCORE_HTTP_PORTS from aspnet base image - ASPNETCORE_HTTP_PORTS= \ - # Disable debugger and profiler diagnostics to avoid diagnosing self. - COMPlus_EnableDiagnostics=0 \ - # Default Filter - DefaultProcess__Filters__0__Key=ProcessId \ - DefaultProcess__Filters__0__Value=1 \ - # Remove Unix Domain Socket before starting diagnostic port server - DiagnosticPort__DeleteEndpointOnStartup=true \ - # Server GC mode - DOTNET_gcServer=1 \ - # Logging: JSON format so that analytic platforms can get discrete entry information - Logging__Console__FormatterName=json \ - # Logging: Use round-trip date/time format without timezone information (always logged in UTC) - Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \ - # Logging: Write timestamps using UTC offset (+0:00) - Logging__Console__FormatterOptions__UseUtcTimestamp=true \ - # Add dotnet-monitor path to front of PATH for easier, prioritized execution - PATH="/app:${PATH}" - -ENTRYPOINT [ "dotnet-monitor" ] -CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ] diff --git a/src/monitor/9.1/azurelinux-distroless/amd64/Dockerfile b/src/monitor/9.1/azurelinux-distroless/amd64/Dockerfile deleted file mode 100644 index 39b2f94e9c..0000000000 --- a/src/monitor/9.1/azurelinux-distroless/amd64/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/monitor/base - -# Installer image -FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer - -RUN tdnf install -y \ - ca-certificates \ - gzip \ - tar \ - && tdnf clean all - -# Retrieve .NET Monitor extensions -RUN dotnet_monitor_extension_version=9.1.0-preview.3.25257.5 \ - && curl --fail --show-error --location \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - --output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - && dotnet_monitor_azureblobstorage_sha512='e2c45ea3a7adf72d358bb5fecef4efdc59eedf0760921557923766f633d3ae81e85e646a176544d9ffb1bcb763565c6653c199ea53ec73e99aebe88aec8a7bc6' \ - && echo "$dotnet_monitor_azureblobstorage_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ - && dotnet_monitor_s3storage_sha512='82b550ad9432b86ff58f0bb0f959cd52341b2225d3806fd7211b28462bb216b99ddd828fc36146fca2e92c6c545bc6d81c629ee8dd691d69cd2232528b81d48b' \ - && echo "$dotnet_monitor_s3storage_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ - && mkdir --parents /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-azureblobstorage.tar.gz --directory /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-s3storage.tar.gz --directory /app \ - && rm \ - dotnet-monitor-egress-azureblobstorage.tar.gz \ - dotnet-monitor-egress-s3storage.tar.gz - - -# .NET Monitor image -FROM $REPO:9.1.0-preview.3-amd64 - -COPY --from=installer ["/app", "/app"] diff --git a/src/monitor/9.1/azurelinux-distroless/arm64v8/Dockerfile b/src/monitor/9.1/azurelinux-distroless/arm64v8/Dockerfile deleted file mode 100644 index 9c60396b78..0000000000 --- a/src/monitor/9.1/azurelinux-distroless/arm64v8/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/monitor/base - -# Installer image -FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer - -RUN tdnf install -y \ - ca-certificates \ - gzip \ - tar \ - && tdnf clean all - -# Retrieve .NET Monitor extensions -RUN dotnet_monitor_extension_version=9.1.0-preview.3.25257.5 \ - && curl --fail --show-error --location \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - --output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - && dotnet_monitor_azureblobstorage_sha512='88fbc937285b7eb1bfaf2cbe2099b67f714ed625bd44fd61dabfc8f6e6f177d514e2e6af29fe5209ec35ab94876c4ca18119e3aaa74096ee22a6d879409713a9' \ - && echo "$dotnet_monitor_azureblobstorage_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ - && dotnet_monitor_s3storage_sha512='3854991fe4a6bbbd18f7504d8e4da8ade88133a8db0172facd8a50b8057967fbc8ad5643776c68f04b5bcdd5fd901bc2d298d2007a88a2046261c0cfb57226aa' \ - && echo "$dotnet_monitor_s3storage_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ - && mkdir --parents /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-azureblobstorage.tar.gz --directory /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-s3storage.tar.gz --directory /app \ - && rm \ - dotnet-monitor-egress-azureblobstorage.tar.gz \ - dotnet-monitor-egress-s3storage.tar.gz - - -# .NET Monitor image -FROM $REPO:9.1.0-preview.3-arm64v8 - -COPY --from=installer ["/app", "/app"] diff --git a/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile index 305d9f2609..dd337da858 100644 --- a/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile +++ b/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile index 84a9ae8efb..91713733ff 100644 --- a/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile index 54526b4e36..8c19977938 100644 --- a/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile +++ b/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile index c174e10f2b..ebf827ab59 100644 --- a/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/8.0/nanoserver-1809/amd64/Dockerfile b/src/sdk/8.0/nanoserver-1809/amd64/Dockerfile index dea0cd1009..8cd824a574 100644 --- a/src/sdk/8.0/nanoserver-1809/amd64/Dockerfile +++ b/src/sdk/8.0/nanoserver-1809/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile index 13ee6c70a4..00b8f78e5f 100644 --- a/src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile +++ b/src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile index e673147987..6e120ec214 100644 --- a/src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile index 778860c48f..6880f4d9a9 100644 --- a/src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile +++ b/src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile index bf5f1ac4c8..640cbaa018 100644 --- a/src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile +++ b/src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile index 770f07346e..646def4a11 100644 --- a/src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/9.0/nanoserver-1809/amd64/Dockerfile b/src/sdk/9.0/nanoserver-1809/amd64/Dockerfile index f48f881387..9eafba3a14 100644 --- a/src/sdk/9.0/nanoserver-1809/amd64/Dockerfile +++ b/src/sdk/9.0/nanoserver-1809/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile index 5de5b6e75a..981295a23a 100644 --- a/src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile +++ b/src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile index 0287d97481..04f39c9ff7 100644 --- a/src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile b/src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile index 14248bc5fd..6a47e9955d 100644 --- a/src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile +++ b/src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile index d8ba333e49..91debc4a86 100644 --- a/src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile +++ b/src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile index 71f81aa4f9..179729a97d 100644 --- a/src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -10,8 +10,8 @@ RUN powershell -Command " ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.51.2.windows.1/MinGit-2.51.2-64-bit.zip; ` - $mingit_sha256 = '8f0a7bc389c0bccc9daf6107cff4efb176348e34b8d787f02a36679a5588e072'; ` + Invoke-WebRequest -OutFile mingit.zip https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/MinGit-2.52.0-64-bit.zip; ` + $mingit_sha256 = 'f42a561840627747ad48e6ece05a14093292d31f3393a401a7f7c780ee7695c2'; ` if ((Get-FileHash mingit.zip -Algorithm sha256).Hash -ne $mingit_sha256) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` exit 1; ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-9.1-azurelinux-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-9.1-azurelinux-distroless-amd64-Dockerfile.approved.txt deleted file mode 100644 index 0011ad4cfe..0000000000 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-9.1-azurelinux-distroless-amd64-Dockerfile.approved.txt +++ /dev/null @@ -1,34 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/monitor/base - -# Installer image -FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer - -ARG ACCESSTOKEN - -RUN tdnf install -y \ - ca-certificates \ - gzip \ - tar \ - && tdnf clean all - -# Retrieve .NET Monitor extensions -RUN dotnet_monitor_extension_version=0.0.0 \ - && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetstage.blob.core.windows.net/$dotnet_monitor_extension_version/BlobAssets/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetstage.blob.core.windows.net/$dotnet_monitor_extension_version/BlobAssets/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \ - && dotnet_monitor_azureblobstorage_sha512='{sha512_placeholder}' \ - && echo "$dotnet_monitor_azureblobstorage_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ - && dotnet_monitor_s3storage_sha512='{sha512_placeholder}' \ - && echo "$dotnet_monitor_s3storage_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ - && mkdir --parents /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-azureblobstorage.tar.gz --directory /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-s3storage.tar.gz --directory /app \ - && rm \ - dotnet-monitor-egress-azureblobstorage.tar.gz \ - dotnet-monitor-egress-s3storage.tar.gz - - -# .NET Monitor image -FROM $REPO:0.0.0-amd64 - -COPY --from=installer ["/app", "/app"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-9.1-azurelinux-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-9.1-azurelinux-distroless-arm64v8-Dockerfile.approved.txt deleted file mode 100644 index 49b433ae5c..0000000000 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-9.1-azurelinux-distroless-arm64v8-Dockerfile.approved.txt +++ /dev/null @@ -1,34 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/monitor/base - -# Installer image -FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer - -ARG ACCESSTOKEN - -RUN tdnf install -y \ - ca-certificates \ - gzip \ - tar \ - && tdnf clean all - -# Retrieve .NET Monitor extensions -RUN dotnet_monitor_extension_version=0.0.0 \ - && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --output dotnet-monitor-egress-azureblobstorage.tar.gz https://dotnetstage.blob.core.windows.net/$dotnet_monitor_extension_version/BlobAssets/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - --output dotnet-monitor-egress-s3storage.tar.gz https://dotnetstage.blob.core.windows.net/$dotnet_monitor_extension_version/BlobAssets/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \ - && dotnet_monitor_azureblobstorage_sha512='{sha512_placeholder}' \ - && echo "$dotnet_monitor_azureblobstorage_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \ - && dotnet_monitor_s3storage_sha512='{sha512_placeholder}' \ - && echo "$dotnet_monitor_s3storage_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \ - && mkdir --parents /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-azureblobstorage.tar.gz --directory /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-s3storage.tar.gz --directory /app \ - && rm \ - dotnet-monitor-egress-azureblobstorage.tar.gz \ - dotnet-monitor-egress-s3storage.tar.gz - - -# .NET Monitor image -FROM $REPO:0.0.0-arm64v8 - -COPY --from=installer ["/app", "/app"] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-9.1-azurelinux-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-9.1-azurelinux-distroless-amd64-Dockerfile.approved.txt deleted file mode 100644 index f88b860057..0000000000 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-9.1-azurelinux-distroless-amd64-Dockerfile.approved.txt +++ /dev/null @@ -1,52 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/aspnet - -# Installer image -FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer - -ARG ACCESSTOKEN - -RUN tdnf install -y \ - ca-certificates \ - gzip \ - tar \ - && tdnf clean all - -# Retrieve .NET Monitor Base -RUN dotnet_monitor_version=0.0.0 \ - && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location --output dotnet-monitor-base.tar.gz https://dotnetstage.blob.core.windows.net/$dotnet_monitor_version/BlobAssets/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \ - && dotnet_monitor_base_sha512='{sha512_placeholder}' \ - && echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \ - && mkdir --parents /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-base.tar.gz --directory /app \ - && rm dotnet-monitor-base.tar.gz - - -# .NET Monitor Base image -FROM $REPO:0.0.0-azurelinux3.0-distroless-amd64 - -WORKDIR /app -COPY --from=installer /app . - -ENV \ - # Unset ASPNETCORE_HTTP_PORTS from aspnet base image - ASPNETCORE_HTTP_PORTS= \ - # Disable debugger and profiler diagnostics to avoid diagnosing self. - COMPlus_EnableDiagnostics=0 \ - # Default Filter - DefaultProcess__Filters__0__Key=ProcessId \ - DefaultProcess__Filters__0__Value=1 \ - # Remove Unix Domain Socket before starting diagnostic port server - DiagnosticPort__DeleteEndpointOnStartup=true \ - # Server GC mode - DOTNET_gcServer=1 \ - # Logging: JSON format so that analytic platforms can get discrete entry information - Logging__Console__FormatterName=json \ - # Logging: Use round-trip date/time format without timezone information (always logged in UTC) - Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \ - # Logging: Write timestamps using UTC offset (+0:00) - Logging__Console__FormatterOptions__UseUtcTimestamp=true \ - # Add dotnet-monitor path to front of PATH for easier, prioritized execution - PATH="/app:${PATH}" - -ENTRYPOINT [ "dotnet-monitor" ] -CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ] diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-9.1-azurelinux-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-9.1-azurelinux-distroless-arm64v8-Dockerfile.approved.txt deleted file mode 100644 index f55c2c3f4d..0000000000 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-base-9.1-azurelinux-distroless-arm64v8-Dockerfile.approved.txt +++ /dev/null @@ -1,52 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/aspnet - -# Installer image -FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer - -ARG ACCESSTOKEN - -RUN tdnf install -y \ - ca-certificates \ - gzip \ - tar \ - && tdnf clean all - -# Retrieve .NET Monitor Base -RUN dotnet_monitor_version=0.0.0 \ - && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location --output dotnet-monitor-base.tar.gz https://dotnetstage.blob.core.windows.net/$dotnet_monitor_version/BlobAssets/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \ - && dotnet_monitor_base_sha512='{sha512_placeholder}' \ - && echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \ - && mkdir --parents /app \ - && tar --gzip --extract --no-same-owner --file dotnet-monitor-base.tar.gz --directory /app \ - && rm dotnet-monitor-base.tar.gz - - -# .NET Monitor Base image -FROM $REPO:0.0.0-azurelinux3.0-distroless-arm64v8 - -WORKDIR /app -COPY --from=installer /app . - -ENV \ - # Unset ASPNETCORE_HTTP_PORTS from aspnet base image - ASPNETCORE_HTTP_PORTS= \ - # Disable debugger and profiler diagnostics to avoid diagnosing self. - COMPlus_EnableDiagnostics=0 \ - # Default Filter - DefaultProcess__Filters__0__Key=ProcessId \ - DefaultProcess__Filters__0__Value=1 \ - # Remove Unix Domain Socket before starting diagnostic port server - DiagnosticPort__DeleteEndpointOnStartup=true \ - # Server GC mode - DOTNET_gcServer=1 \ - # Logging: JSON format so that analytic platforms can get discrete entry information - Logging__Console__FormatterName=json \ - # Logging: Use round-trip date/time format without timezone information (always logged in UTC) - Logging__Console__FormatterOptions__TimestampFormat=yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffff'Z' \ - # Logging: Write timestamps using UTC offset (+0:00) - Logging__Console__FormatterOptions__UseUtcTimestamp=true \ - # Add dotnet-monitor path to front of PATH for easier, prioritized execution - PATH="/app:${PATH}" - -ENTRYPOINT [ "dotnet-monitor" ] -CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ] diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs index 41fabd65f7..98e627d8fd 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs @@ -14,7 +14,6 @@ public readonly record struct ImageVersion public static readonly ImageVersion V8_1 = new(new Version(8, 1), isPreview: false); public static readonly ImageVersion V9_0 = new(new Version(9, 0), isPreview: false); public static readonly ImageVersion V9_1 = new(new Version(9, 1), isPreview: false); - public static readonly ImageVersion V9_1_Preview = new(new Version(9, 1), isPreview: true); public static readonly ImageVersion V13_0 = new(new Version(13, 0), isPreview: false); public static readonly ImageVersion V9_2_Preview = new(new Version(9, 2), isPreview: true); public static readonly ImageVersion V10_0 = new(new Version(10, 0), isPreview: false); diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index a1c5908c2b..6b6fe794ff 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -358,8 +358,6 @@ public static class TestData new ProductImageData { Version = V8_1, VersionFamily = V8_0, OS = OS.AzureLinux30Distroless, OSDir = OS.AzureLinuxDistroless, OSTag = OS.MarinerDistroless, Arch = Arch.Arm64, SupportedImageRepos = DotNetImageRepo.Monitor | DotNetImageRepo.Monitor_Base }, new ProductImageData { Version = V9_0, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSDir = OS.AzureLinuxDistroless, OSTag = "", Arch = Arch.Amd64, SupportedImageRepos = DotNetImageRepo.Monitor | DotNetImageRepo.Monitor_Base }, new ProductImageData { Version = V9_0, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSDir = OS.AzureLinuxDistroless, OSTag = "", Arch = Arch.Arm64, SupportedImageRepos = DotNetImageRepo.Monitor | DotNetImageRepo.Monitor_Base }, - new ProductImageData { Version = V9_1_Preview, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSDir = OS.AzureLinuxDistroless, OSTag = "", Arch = Arch.Amd64, SupportedImageRepos = DotNetImageRepo.Monitor | DotNetImageRepo.Monitor_Base }, - new ProductImageData { Version = V9_1_Preview, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSDir = OS.AzureLinuxDistroless, OSTag = "", Arch = Arch.Arm64, SupportedImageRepos = DotNetImageRepo.Monitor | DotNetImageRepo.Monitor_Base }, new ProductImageData { Version = V10_0, VersionFamily = V10_0, OS = OS.AzureLinux30Distroless, OSDir = OS.AzureLinuxDistroless, OSTag = "", Arch = Arch.Amd64, SupportedImageRepos = DotNetImageRepo.Monitor | DotNetImageRepo.Monitor_Base }, new ProductImageData { Version = V10_0, VersionFamily = V10_0, OS = OS.AzureLinux30Distroless, OSDir = OS.AzureLinuxDistroless, OSTag = "", Arch = Arch.Arm64, SupportedImageRepos = DotNetImageRepo.Monitor | DotNetImageRepo.Monitor_Base }, ];