diff --git a/README.monitor-base.md b/README.monitor-base.md index e532dec925..145fbe4fca 100644 --- a/README.monitor-base.md +++ b/README.monitor-base.md @@ -59,27 +59,27 @@ The following Dockerfiles demonstrate how you can use this base image to build a Tags | Dockerfile | OS Version -----------| -------------| ------------- 8.0.4-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.4, 8.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 -8.0.4-cbl-mariner-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 +8.0.4-azurelinux-distroless-amd64, 8.0-azurelinux-distroless-amd64, 8.0.4-azurelinux-distroless, 8.0-azurelinux-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 ##### .NET Monitor Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.0-preview.7-amd64, 9.0-preview-amd64, 9.0.0-preview.7, 9.0-preview, 9-preview, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 8.1.0-alpha.1-ubuntu-chiseled-amd64, 8.1-preview-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.1.0-alpha.1-ubuntu-chiseled, 8.1-preview-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.0-alpha.1, 8.1-preview, 8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 -8.1.0-alpha.1-cbl-mariner-distroless-amd64, 8.1-preview-cbl-mariner-distroless-amd64, 8-cbl-mariner-distroless-amd64, 8.1.0-alpha.1-cbl-mariner-distroless, 8.1-preview-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.1/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 +8.1.0-alpha.1-azurelinux-distroless-amd64, 8.1-preview-azurelinux-distroless-amd64, 8-azurelinux-distroless-amd64, 8.1.0-alpha.1-azurelinux-distroless, 8.1-preview-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- 8.0.4-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.4, 8.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 -8.0.4-cbl-mariner-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 +8.0.4-azurelinux-distroless-arm64v8, 8.0-azurelinux-distroless-arm64v8, 8.0.4-azurelinux-distroless, 8.0-azurelinux-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 ##### .NET Monitor Preview Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.0-preview.7-arm64v8, 9.0-preview-arm64v8, 9.0.0-preview.7, 9.0-preview, 9-preview, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.1.0-alpha.1-ubuntu-chiseled-arm64v8, 8.1-preview-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.1.0-alpha.1-ubuntu-chiseled, 8.1-preview-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.0-alpha.1, 8.1-preview, 8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 -8.1.0-alpha.1-cbl-mariner-distroless-arm64v8, 8.1-preview-cbl-mariner-distroless-arm64v8, 8-cbl-mariner-distroless-arm64v8, 8.1.0-alpha.1-cbl-mariner-distroless, 8.1-preview-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.1/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 +8.1.0-alpha.1-azurelinux-distroless-arm64v8, 8.1-preview-azurelinux-distroless-arm64v8, 8-azurelinux-distroless-arm64v8, 8.1.0-alpha.1-azurelinux-distroless, 8.1-preview-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 You can retrieve a list of all available tags for dotnet/nightly/monitor/base at https://mcr.microsoft.com/v2/dotnet/nightly/monitor/base/tags/list. diff --git a/README.monitor.md b/README.monitor.md index 67dccc816c..bfda1e8f2b 100644 --- a/README.monitor.md +++ b/README.monitor.md @@ -60,7 +60,7 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how Tags | Dockerfile | OS Version -----------| -------------| ------------- 8.0.4-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.4, 8.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 -8.0.4-cbl-mariner-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 +8.0.4-azurelinux-distroless-amd64, 8.0-azurelinux-distroless-amd64, 8.0.4-azurelinux-distroless, 8.0-azurelinux-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 6.3.8-alpine-amd64, 6.3-alpine-amd64, 6-alpine-amd64, 6.3.8-alpine, 6.3-alpine, 6-alpine, 6.3.8, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.20 6.3.8-ubuntu-chiseled-amd64, 6.3-ubuntu-chiseled-amd64, 6-ubuntu-chiseled-amd64, 6.3.8-ubuntu-chiseled, 6.3-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 6.3.8-cbl-mariner-amd64, 6.3-cbl-mariner-amd64, 6-cbl-mariner-amd64, 6.3.8-cbl-mariner, 6.3-cbl-mariner, 6-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.3/cbl-mariner/amd64/Dockerfile) | CBL-Mariner 2.0 @@ -71,13 +71,13 @@ Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.0-preview.7-amd64, 9.0-preview-amd64, 9.0.0-preview.7, 9.0-preview, 9-preview, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 8.1.0-alpha.1-ubuntu-chiseled-amd64, 8.1-preview-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.1.0-alpha.1-ubuntu-chiseled, 8.1-preview-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.0-alpha.1, 8.1-preview, 8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.1/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 -8.1.0-alpha.1-cbl-mariner-distroless-amd64, 8.1-preview-cbl-mariner-distroless-amd64, 8-cbl-mariner-distroless-amd64, 8.1.0-alpha.1-cbl-mariner-distroless, 8.1-preview-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.1/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 +8.1.0-alpha.1-azurelinux-distroless-amd64, 8.1-preview-azurelinux-distroless-amd64, 8-azurelinux-distroless-amd64, 8.1.0-alpha.1-azurelinux-distroless, 8.1-preview-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- 8.0.4-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.4, 8.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 -8.0.4-cbl-mariner-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 +8.0.4-azurelinux-distroless-arm64v8, 8.0-azurelinux-distroless-arm64v8, 8.0.4-azurelinux-distroless, 8.0-azurelinux-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 6.3.8-alpine-arm64v8, 6.3-alpine-arm64v8, 6-alpine-arm64v8, 6.3.8-alpine, 6.3-alpine, 6-alpine, 6.3.8, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.20 6.3.8-ubuntu-chiseled-arm64v8, 6.3-ubuntu-chiseled-arm64v8, 6-ubuntu-chiseled-arm64v8, 6.3.8-ubuntu-chiseled, 6.3-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 6.3.8-cbl-mariner-arm64v8, 6.3-cbl-mariner-arm64v8, 6-cbl-mariner-arm64v8, 6.3.8-cbl-mariner, 6.3-cbl-mariner, 6-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile) | CBL-Mariner 2.0 @@ -88,7 +88,7 @@ Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.0-preview.7-arm64v8, 9.0-preview-arm64v8, 9.0.0-preview.7, 9.0-preview, 9-preview, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 8.1.0-alpha.1-ubuntu-chiseled-arm64v8, 8.1-preview-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.1.0-alpha.1-ubuntu-chiseled, 8.1-preview-ubuntu-chiseled, 8-ubuntu-chiseled, 8.1.0-alpha.1, 8.1-preview, 8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.1/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 -8.1.0-alpha.1-cbl-mariner-distroless-arm64v8, 8.1-preview-cbl-mariner-distroless-arm64v8, 8-cbl-mariner-distroless-arm64v8, 8.1.0-alpha.1-cbl-mariner-distroless, 8.1-preview-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.1/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 +8.1.0-alpha.1-azurelinux-distroless-arm64v8, 8.1-preview-azurelinux-distroless-arm64v8, 8-azurelinux-distroless-arm64v8, 8.1.0-alpha.1-azurelinux-distroless, 8.1-preview-azurelinux-distroless, 8-azurelinux-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/8.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 You can retrieve a list of all available tags for dotnet/nightly/monitor at https://mcr.microsoft.com/v2/dotnet/nightly/monitor/tags/list. diff --git a/eng/mcr-tags-metadata-templates/monitor-base-tags.yml b/eng/mcr-tags-metadata-templates/monitor-base-tags.yml index 94464c889a..676308682d 100644 --- a/eng/mcr-tags-metadata-templates/monitor-base-tags.yml +++ b/eng/mcr-tags-metadata-templates/monitor-base-tags.yml @@ -7,11 +7,11 @@ $(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled-amd64) customSubTableTitle: .NET Monitor Preview Tags $(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled-arm64v8) customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-amd64) +$(McrTagsYmlTagGroup:8.1-preview-azurelinux-distroless-amd64) customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.1-preview-azurelinux-distroless-arm64v8) customSubTableTitle: .NET Monitor Preview Tags $(McrTagsYmlTagGroup:8.0-ubuntu-chiseled-amd64) $(McrTagsYmlTagGroup:8.0-ubuntu-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux-distroless-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux-distroless-arm64v8) diff --git a/eng/mcr-tags-metadata-templates/monitor-tags.yml b/eng/mcr-tags-metadata-templates/monitor-tags.yml index 34c1c21fbe..e858e0a865 100644 --- a/eng/mcr-tags-metadata-templates/monitor-tags.yml +++ b/eng/mcr-tags-metadata-templates/monitor-tags.yml @@ -7,14 +7,14 @@ $(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled-amd64) customSubTableTitle: .NET Monitor Preview Tags $(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled-arm64v8) customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-amd64) +$(McrTagsYmlTagGroup:8.1-preview-azurelinux-distroless-amd64) customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.1-preview-azurelinux-distroless-arm64v8) customSubTableTitle: .NET Monitor Preview Tags $(McrTagsYmlTagGroup:8.0-ubuntu-chiseled-amd64) $(McrTagsYmlTagGroup:8.0-ubuntu-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.0-azurelinux-distroless-amd64) +$(McrTagsYmlTagGroup:8.0-azurelinux-distroless-arm64v8) $(McrTagsYmlTagGroup:6.3-alpine-amd64) $(McrTagsYmlTagGroup:6.3-alpine-arm64v8) $(McrTagsYmlTagGroup:6.3-ubuntu-chiseled-amd64) diff --git a/manifest.json b/manifest.json index 55332e978e..b380419f88 100644 --- a/manifest.json +++ b/manifest.json @@ -9548,21 +9548,33 @@ { "productVersion": "$(monitor|8.0|product-version)", "sharedTags": { - "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless": {}, - "$(monitor|8.0|minor-tag)-cbl-mariner-distroless": {} + "$(monitor|8.0|fixed-tag)-azurelinux-distroless": {}, + "$(monitor|8.0|minor-tag)-azurelinux-distroless": {}, + "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-cbl-mariner-distroless": { + "docType": "Undocumented" + } }, "platforms": [ { "buildArgs": { "REPO": "$(Repo:aspnet)" }, - "dockerfile": "src/monitor-base/8.0/cbl-mariner-distroless/amd64", + "dockerfile": "src/monitor-base/8.0/azurelinux-distroless/amd64", "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux", "os": "linux", - "osVersion": "cbl-mariner2.0-distroless", + "osVersion": "azurelinux3.0-distroless", "tags": { - "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-amd64": {}, - "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-amd64": {} + "$(monitor|8.0|fixed-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8.0|minor-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + } } }, { @@ -9570,13 +9582,19 @@ "buildArgs": { "REPO": "$(Repo:aspnet)" }, - "dockerfile": "src/monitor-base/8.0/cbl-mariner-distroless/arm64v8", + "dockerfile": "src/monitor-base/8.0/azurelinux-distroless/arm64v8", "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux", "os": "linux", - "osVersion": "cbl-mariner2.0-distroless", + "osVersion": "azurelinux3.0-distroless", "tags": { - "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-arm64v8": {}, - "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": {} + "$(monitor|8.0|fixed-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8.0|minor-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } @@ -9628,23 +9646,29 @@ { "productVersion": "$(monitor|8.1|product-version)", "sharedTags": { - "$(monitor|8.1|fixed-tag)-cbl-mariner-distroless": {}, - "$(monitor|8.1|minor-tag)-cbl-mariner-distroless": {}, - "$(monitor|8|major-tag)-cbl-mariner-distroless": {} + "$(monitor|8.1|fixed-tag)-azurelinux-distroless": {}, + "$(monitor|8.1|minor-tag)-azurelinux-distroless": {}, + "$(monitor|8|major-tag)-azurelinux-distroless": {}, + "$(monitor|8|major-tag)-cbl-mariner-distroless": { + "docType": "Undocumented" + } }, "platforms": [ { "buildArgs": { "REPO": "$(Repo:aspnet)" }, - "dockerfile": "src/monitor-base/8.1/cbl-mariner-distroless/amd64", + "dockerfile": "src/monitor-base/8.1/azurelinux-distroless/amd64", "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux", "os": "linux", - "osVersion": "cbl-mariner2.0-distroless", + "osVersion": "azurelinux3.0-distroless", "tags": { - "$(monitor|8.1|fixed-tag)-cbl-mariner-distroless-amd64": {}, - "$(monitor|8.1|minor-tag)-cbl-mariner-distroless-amd64": {}, - "$(monitor|8|major-tag)-cbl-mariner-distroless-amd64": {} + "$(monitor|8.1|fixed-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8.1|minor-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8|major-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8|major-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + } } }, { @@ -9652,14 +9676,17 @@ "buildArgs": { "REPO": "$(Repo:aspnet)" }, - "dockerfile": "src/monitor-base/8.1/cbl-mariner-distroless/arm64v8", + "dockerfile": "src/monitor-base/8.1/azurelinux-distroless/arm64v8", "dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux", "os": "linux", - "osVersion": "cbl-mariner2.0-distroless", + "osVersion": "azurelinux3.0-distroless", "tags": { - "$(monitor|8.1|fixed-tag)-cbl-mariner-distroless-arm64v8": {}, - "$(monitor|8.1|minor-tag)-cbl-mariner-distroless-arm64v8": {}, - "$(monitor|8|major-tag)-cbl-mariner-distroless-arm64v8": {} + "$(monitor|8.1|fixed-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8.1|minor-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8|major-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8|major-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } @@ -9930,21 +9957,33 @@ { "productVersion": "$(monitor|8.0|product-version)", "sharedTags": { - "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless": {}, - "$(monitor|8.0|minor-tag)-cbl-mariner-distroless": {} + "$(monitor|8.0|fixed-tag)-azurelinux-distroless": {}, + "$(monitor|8.0|minor-tag)-azurelinux-distroless": {}, + "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-cbl-mariner-distroless": { + "docType": "Undocumented" + } }, "platforms": [ { "buildArgs": { "REPO": "$(Repo:monitor-base)" }, - "dockerfile": "src/monitor/8.0/cbl-mariner-distroless/amd64", + "dockerfile": "src/monitor/8.0/azurelinux-distroless/amd64", "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux.extensions", "os": "linux", - "osVersion": "cbl-mariner2.0-distroless", + "osVersion": "azurelinux3.0-distroless", "tags": { - "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-amd64": {}, - "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-amd64": {} + "$(monitor|8.0|fixed-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8.0|minor-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + } } }, { @@ -9952,13 +9991,19 @@ "buildArgs": { "REPO": "$(Repo:monitor-base)" }, - "dockerfile": "src/monitor/8.0/cbl-mariner-distroless/arm64v8", + "dockerfile": "src/monitor/8.0/azurelinux-distroless/arm64v8", "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux.extensions", "os": "linux", - "osVersion": "cbl-mariner2.0-distroless", + "osVersion": "azurelinux3.0-distroless", "tags": { - "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-arm64v8": {}, - "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": {} + "$(monitor|8.0|fixed-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8.0|minor-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8.0|fixed-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } @@ -10010,23 +10055,29 @@ { "productVersion": "$(monitor|8.1|product-version)", "sharedTags": { - "$(monitor|8.1|fixed-tag)-cbl-mariner-distroless": {}, - "$(monitor|8.1|minor-tag)-cbl-mariner-distroless": {}, - "$(monitor|8|major-tag)-cbl-mariner-distroless": {} + "$(monitor|8.1|fixed-tag)-azurelinux-distroless": {}, + "$(monitor|8.1|minor-tag)-azurelinux-distroless": {}, + "$(monitor|8|major-tag)-azurelinux-distroless": {}, + "$(monitor|8|major-tag)-cbl-mariner-distroless": { + "docType": "Undocumented" + } }, "platforms": [ { "buildArgs": { "REPO": "$(Repo:monitor-base)" }, - "dockerfile": "src/monitor/8.1/cbl-mariner-distroless/amd64", + "dockerfile": "src/monitor/8.1/azurelinux-distroless/amd64", "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux.extensions", "os": "linux", - "osVersion": "cbl-mariner2.0-distroless", + "osVersion": "azurelinux3.0-distroless", "tags": { - "$(monitor|8.1|fixed-tag)-cbl-mariner-distroless-amd64": {}, - "$(monitor|8.1|minor-tag)-cbl-mariner-distroless-amd64": {}, - "$(monitor|8|major-tag)-cbl-mariner-distroless-amd64": {} + "$(monitor|8.1|fixed-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8.1|minor-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8|major-tag)-azurelinux-distroless-amd64": {}, + "$(monitor|8|major-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + } } }, { @@ -10034,14 +10085,17 @@ "buildArgs": { "REPO": "$(Repo:monitor-base)" }, - "dockerfile": "src/monitor/8.1/cbl-mariner-distroless/arm64v8", + "dockerfile": "src/monitor/8.1/azurelinux-distroless/arm64v8", "dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux.extensions", "os": "linux", - "osVersion": "cbl-mariner2.0-distroless", + "osVersion": "azurelinux3.0-distroless", "tags": { - "$(monitor|8.1|fixed-tag)-cbl-mariner-distroless-arm64v8": {}, - "$(monitor|8.1|minor-tag)-cbl-mariner-distroless-arm64v8": {}, - "$(monitor|8|major-tag)-cbl-mariner-distroless-arm64v8": {} + "$(monitor|8.1|fixed-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8.1|minor-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8|major-tag)-azurelinux-distroless-arm64v8": {}, + "$(monitor|8|major-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } diff --git a/src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile b/src/monitor-base/8.0/azurelinux-distroless/amd64/Dockerfile similarity index 94% rename from src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile rename to src/monitor-base/8.0/azurelinux-distroless/amd64/Dockerfile index 0406d0f4d8..79acce33dd 100644 --- a/src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile +++ b/src/monitor-base/8.0/azurelinux-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ @@ -20,7 +20,7 @@ RUN dotnet_monitor_version=8.0.4 \ # .NET Monitor Base image -FROM $REPO:8.0.7-cbl-mariner2.0-distroless-amd64 +FROM $REPO:8.0.7-azurelinux3.0-distroless-amd64 WORKDIR /app COPY --from=installer /app . diff --git a/src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile b/src/monitor-base/8.0/azurelinux-distroless/arm64v8/Dockerfile similarity index 94% rename from src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile rename to src/monitor-base/8.0/azurelinux-distroless/arm64v8/Dockerfile index 9aa2f32f35..57f25ab8e3 100644 --- a/src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile +++ b/src/monitor-base/8.0/azurelinux-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ @@ -20,7 +20,7 @@ RUN dotnet_monitor_version=8.0.4 \ # .NET Monitor Base image -FROM $REPO:8.0.7-cbl-mariner2.0-distroless-arm64v8 +FROM $REPO:8.0.7-azurelinux3.0-distroless-arm64v8 WORKDIR /app COPY --from=installer /app . diff --git a/src/monitor-base/8.1/cbl-mariner-distroless/amd64/Dockerfile b/src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile similarity index 94% rename from src/monitor-base/8.1/cbl-mariner-distroless/amd64/Dockerfile rename to src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile index fffc97bae0..9649793578 100644 --- a/src/monitor-base/8.1/cbl-mariner-distroless/amd64/Dockerfile +++ b/src/monitor-base/8.1/azurelinux-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ @@ -20,7 +20,7 @@ RUN dotnet_monitor_version=8.1.0-alpha.1.24401.5 \ # .NET Monitor Base image -FROM $REPO:8.0.7-cbl-mariner2.0-distroless-amd64 +FROM $REPO:8.0.7-azurelinux3.0-distroless-amd64 WORKDIR /app COPY --from=installer /app . diff --git a/src/monitor-base/8.1/cbl-mariner-distroless/arm64v8/Dockerfile b/src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile similarity index 94% rename from src/monitor-base/8.1/cbl-mariner-distroless/arm64v8/Dockerfile rename to src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile index ef7479ba70..106b7b14a4 100644 --- a/src/monitor-base/8.1/cbl-mariner-distroless/arm64v8/Dockerfile +++ b/src/monitor-base/8.1/azurelinux-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ @@ -20,7 +20,7 @@ RUN dotnet_monitor_version=8.1.0-alpha.1.24401.5 \ # .NET Monitor Base image -FROM $REPO:8.0.7-cbl-mariner2.0-distroless-arm64v8 +FROM $REPO:8.0.7-azurelinux3.0-distroless-arm64v8 WORKDIR /app COPY --from=installer /app . diff --git a/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile b/src/monitor/8.0/azurelinux-distroless/amd64/Dockerfile similarity index 93% rename from src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile rename to src/monitor/8.0/azurelinux-distroless/amd64/Dockerfile index 26efbec183..a3ff57a077 100644 --- a/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile +++ b/src/monitor/8.0/azurelinux-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/monitor/base # Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=8.0.4 \ # .NET Monitor image -FROM $REPO:8.0.4-cbl-mariner-distroless-amd64 +FROM $REPO:8.0.4-azurelinux-distroless-amd64 COPY --from=installer ["/app", "/app"] diff --git a/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile b/src/monitor/8.0/azurelinux-distroless/arm64v8/Dockerfile similarity index 93% rename from src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile rename to src/monitor/8.0/azurelinux-distroless/arm64v8/Dockerfile index 8fb278864c..4a0a5a3118 100644 --- a/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile +++ b/src/monitor/8.0/azurelinux-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/monitor/base # Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=8.0.4 \ # .NET Monitor image -FROM $REPO:8.0.4-cbl-mariner-distroless-arm64v8 +FROM $REPO:8.0.4-azurelinux-distroless-arm64v8 COPY --from=installer ["/app", "/app"] diff --git a/src/monitor/8.1/cbl-mariner-distroless/amd64/Dockerfile b/src/monitor/8.1/azurelinux-distroless/amd64/Dockerfile similarity index 93% rename from src/monitor/8.1/cbl-mariner-distroless/amd64/Dockerfile rename to src/monitor/8.1/azurelinux-distroless/amd64/Dockerfile index 6300b7d9de..4461b32724 100644 --- a/src/monitor/8.1/cbl-mariner-distroless/amd64/Dockerfile +++ b/src/monitor/8.1/azurelinux-distroless/amd64/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/monitor/base # Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=8.1.0-alpha.1.24401.5 \ # .NET Monitor image -FROM $REPO:8.1.0-alpha.1-cbl-mariner-distroless-amd64 +FROM $REPO:8.1.0-alpha.1-azurelinux-distroless-amd64 COPY --from=installer ["/app", "/app"] diff --git a/src/monitor/8.1/cbl-mariner-distroless/arm64v8/Dockerfile b/src/monitor/8.1/azurelinux-distroless/arm64v8/Dockerfile similarity index 93% rename from src/monitor/8.1/cbl-mariner-distroless/arm64v8/Dockerfile rename to src/monitor/8.1/azurelinux-distroless/arm64v8/Dockerfile index 0a73def567..2f90c49222 100644 --- a/src/monitor/8.1/cbl-mariner-distroless/arm64v8/Dockerfile +++ b/src/monitor/8.1/azurelinux-distroless/arm64v8/Dockerfile @@ -1,7 +1,7 @@ ARG REPO=mcr.microsoft.com/dotnet/monitor/base # Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer +FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer RUN tdnf install -y \ ca-certificates \ @@ -27,6 +27,6 @@ RUN dotnet_monitor_extension_version=8.1.0-alpha.1.24401.5 \ # .NET Monitor image -FROM $REPO:8.1.0-alpha.1-cbl-mariner-distroless-arm64v8 +FROM $REPO:8.1.0-alpha.1-azurelinux-distroless-arm64v8 COPY --from=installer ["/app", "/app"] diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json index ed3a929994..70014c3bf9 100644 --- a/tests/performance/ImageSize.nightly.linux.json +++ b/tests/performance/ImageSize.nightly.linux.json @@ -409,12 +409,12 @@ "src/monitor/6.3/cbl-mariner-distroless/arm64v8": 131783453, "src/monitor/8.0/ubuntu-chiseled/amd64": 127821834, "src/monitor/8.0/ubuntu-chiseled/arm64v8": 134958622, - "src/monitor/8.0/cbl-mariner-distroless/amd64": 141200979, - "src/monitor/8.0/cbl-mariner-distroless/arm64v8": 148117492, + "src/monitor/8.0/azurelinux-distroless/amd64": 141200979, + "src/monitor/8.0/azurelinux-distroless/arm64v8": 148117492, "src/monitor/8.1/ubuntu-chiseled/amd64": 127821834, "src/monitor/8.1/ubuntu-chiseled/arm64v8": 134958622, - "src/monitor/8.1/cbl-mariner-distroless/amd64": 141200979, - "src/monitor/8.1/cbl-mariner-distroless/arm64v8": 148117492, + "src/monitor/8.1/azurelinux-distroless/amd64": 141200979, + "src/monitor/8.1/azurelinux-distroless/arm64v8": 148117492, "src/monitor/9.0/azurelinux-distroless/amd64": 143287803, "src/monitor/9.0/azurelinux-distroless/arm64v8": 149490964 },