From 73af306f4999ca778c832092b2ade9560370273c Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Fri, 4 Oct 2024 12:29:45 -0700 Subject: [PATCH] Undocument .NET Monitor 6.3 and 8.0 arch-specific tags --- README.monitor.md | 24 ++-- .../monitor-tags.yml | 24 ++-- manifest.json | 128 +++++++++++++----- 3 files changed, 120 insertions(+), 56 deletions(-) diff --git a/README.monitor.md b/README.monitor.md index 21b3b66966..a2157487e5 100644 --- a/README.monitor.md +++ b/README.monitor.md @@ -63,12 +63,12 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.0-rc.2-amd64, 9.0-amd64, 9.0.0-rc.2, 9.0, 9, latest | [Dockerfile](src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 -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](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](src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.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](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](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](src/monitor/6.3/cbl-mariner/amd64/Dockerfile) | CBL-Mariner 2.0 -6.3.8-cbl-mariner-distroless-amd64, 6.3-cbl-mariner-distroless-amd64, 6-cbl-mariner-distroless-amd64, 6.3.8-cbl-mariner-distroless, 6.3-cbl-mariner-distroless, 6-cbl-mariner-distroless | [Dockerfile](src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 +8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.4, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 +8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 +6.3.8-alpine, 6.3-alpine, 6-alpine, 6.3.8, 6.3, 6 | [Dockerfile](src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.20 +6.3.8-ubuntu-chiseled, 6.3-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 +6.3.8-cbl-mariner, 6.3-cbl-mariner, 6-cbl-mariner | [Dockerfile](src/monitor/6.3/cbl-mariner/amd64/Dockerfile) | CBL-Mariner 2.0 +6.3.8-cbl-mariner-distroless, 6.3-cbl-mariner-distroless, 6-cbl-mariner-distroless | [Dockerfile](src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 #### .NET Monitor Preview Tags @@ -82,12 +82,12 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 9.0.0-rc.2-arm64v8, 9.0-arm64v8, 9.0.0-rc.2, 9.0, 9, latest | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 -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](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](src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.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](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](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](src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile) | CBL-Mariner 2.0 -6.3.8-cbl-mariner-distroless-arm64v8, 6.3-cbl-mariner-distroless-arm64v8, 6-cbl-mariner-distroless-arm64v8, 6.3.8-cbl-mariner-distroless, 6.3-cbl-mariner-distroless, 6-cbl-mariner-distroless | [Dockerfile](src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 +8.0.4-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.4, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 +8.0.4-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 +6.3.8-alpine, 6.3-alpine, 6-alpine, 6.3.8, 6.3, 6 | [Dockerfile](src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.20 +6.3.8-ubuntu-chiseled, 6.3-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 +6.3.8-cbl-mariner, 6.3-cbl-mariner, 6-cbl-mariner | [Dockerfile](src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile) | CBL-Mariner 2.0 +6.3.8-cbl-mariner-distroless, 6.3-cbl-mariner-distroless, 6-cbl-mariner-distroless | [Dockerfile](src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0 #### .NET Monitor Preview Tags diff --git a/eng/mcr-tags-metadata-templates/monitor-tags.yml b/eng/mcr-tags-metadata-templates/monitor-tags.yml index efa226c246..68bd12d933 100644 --- a/eng/mcr-tags-metadata-templates/monitor-tags.yml +++ b/eng/mcr-tags-metadata-templates/monitor-tags.yml @@ -9,15 +9,15 @@ $(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-amd64) customSubTableTitle: .NET Monitor Preview Tags $(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-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:6.3-alpine-amd64) -$(McrTagsYmlTagGroup:6.3-alpine-arm64v8) -$(McrTagsYmlTagGroup:6.3-ubuntu-chiseled-amd64) -$(McrTagsYmlTagGroup:6.3-ubuntu-chiseled-arm64v8) -$(McrTagsYmlTagGroup:6.3-cbl-mariner-amd64) -$(McrTagsYmlTagGroup:6.3-cbl-mariner-arm64v8) -$(McrTagsYmlTagGroup:6.3-cbl-mariner-distroless-amd64) -$(McrTagsYmlTagGroup:6.3-cbl-mariner-distroless-arm64v8) +$(McrTagsYmlTagGroup:8.0.4-ubuntu-chiseled) +$(McrTagsYmlTagGroup:8.0.4-cbl-mariner-distroless) +$(McrTagsYmlTagGroup:8.0-ubuntu-chiseled) +$(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless) +$(McrTagsYmlTagGroup:6.3.8-alpine) +$(McrTagsYmlTagGroup:6.3.8-ubuntu-chiseled) +$(McrTagsYmlTagGroup:6.3.8-cbl-mariner) +$(McrTagsYmlTagGroup:6.3.8-cbl-mariner-distroless) +$(McrTagsYmlTagGroup:6.3-alpine) +$(McrTagsYmlTagGroup:6.3-ubuntu-chiseled) +$(McrTagsYmlTagGroup:6.3-cbl-mariner) +$(McrTagsYmlTagGroup:6.3-cbl-mariner-distroless) diff --git a/manifest.json b/manifest.json index 663de9f1a2..fe32afd25a 100644 --- a/manifest.json +++ b/manifest.json @@ -9099,9 +9099,15 @@ "os": "linux", "osVersion": "alpine3.20", "tags": { - "$(monitor|6.3|fixed-tag)-alpine-amd64": {}, - "$(monitor|6.3|minor-tag)-alpine-amd64": {}, - "$(monitor|6|major-tag)-alpine-amd64": {} + "$(monitor|6.3|fixed-tag)-alpine-amd64": { + "docType": "Undocumented" + }, + "$(monitor|6.3|minor-tag)-alpine-amd64": { + "docType": "Undocumented" + }, + "$(monitor|6|major-tag)-alpine-amd64": { + "docType": "Undocumented" + } } }, { @@ -9114,9 +9120,15 @@ "os": "linux", "osVersion": "alpine3.20", "tags": { - "$(monitor|6.3|fixed-tag)-alpine-arm64v8": {}, - "$(monitor|6.3|minor-tag)-alpine-arm64v8": {}, - "$(monitor|6|major-tag)-alpine-arm64v8": {} + "$(monitor|6.3|fixed-tag)-alpine-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|6.3|minor-tag)-alpine-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|6|major-tag)-alpine-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } @@ -9139,9 +9151,15 @@ "os": "linux", "osVersion": "jammy-chiseled", "tags": { - "$(monitor|6.3|fixed-tag)-ubuntu-chiseled-amd64": {}, - "$(monitor|6.3|minor-tag)-ubuntu-chiseled-amd64": {}, - "$(monitor|6|major-tag)-ubuntu-chiseled-amd64": {} + "$(monitor|6.3|fixed-tag)-ubuntu-chiseled-amd64": { + "docType": "Undocumented" + }, + "$(monitor|6.3|minor-tag)-ubuntu-chiseled-amd64": { + "docType": "Undocumented" + }, + "$(monitor|6|major-tag)-ubuntu-chiseled-amd64": { + "docType": "Undocumented" + } } }, { @@ -9154,9 +9172,15 @@ "os": "linux", "osVersion": "jammy-chiseled", "tags": { - "$(monitor|6.3|fixed-tag)-ubuntu-chiseled-arm64v8": {}, - "$(monitor|6.3|minor-tag)-ubuntu-chiseled-arm64v8": {}, - "$(monitor|6|major-tag)-ubuntu-chiseled-arm64v8": {} + "$(monitor|6.3|fixed-tag)-ubuntu-chiseled-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|6.3|minor-tag)-ubuntu-chiseled-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|6|major-tag)-ubuntu-chiseled-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } @@ -9179,9 +9203,15 @@ "os": "linux", "osVersion": "cbl-mariner2.0", "tags": { - "$(monitor|6.3|fixed-tag)-cbl-mariner-amd64": {}, - "$(monitor|6.3|minor-tag)-cbl-mariner-amd64": {}, - "$(monitor|6|major-tag)-cbl-mariner-amd64": {} + "$(monitor|6.3|fixed-tag)-cbl-mariner-amd64": { + "docType": "Undocumented" + }, + "$(monitor|6.3|minor-tag)-cbl-mariner-amd64": { + "docType": "Undocumented" + }, + "$(monitor|6|major-tag)-cbl-mariner-amd64": { + "docType": "Undocumented" + } } }, { @@ -9194,9 +9224,15 @@ "os": "linux", "osVersion": "cbl-mariner2.0", "tags": { - "$(monitor|6.3|fixed-tag)-cbl-mariner-arm64v8": {}, - "$(monitor|6.3|minor-tag)-cbl-mariner-arm64v8": {}, - "$(monitor|6|major-tag)-cbl-mariner-arm64v8": {} + "$(monitor|6.3|fixed-tag)-cbl-mariner-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|6.3|minor-tag)-cbl-mariner-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|6|major-tag)-cbl-mariner-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } @@ -9219,9 +9255,15 @@ "os": "linux", "osVersion": "cbl-mariner2.0-distroless", "tags": { - "$(monitor|6.3|fixed-tag)-cbl-mariner-distroless-amd64": {}, - "$(monitor|6.3|minor-tag)-cbl-mariner-distroless-amd64": {}, - "$(monitor|6|major-tag)-cbl-mariner-distroless-amd64": {} + "$(monitor|6.3|fixed-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + }, + "$(monitor|6.3|minor-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + }, + "$(monitor|6|major-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + } } }, { @@ -9234,9 +9276,15 @@ "os": "linux", "osVersion": "cbl-mariner2.0-distroless", "tags": { - "$(monitor|6.3|fixed-tag)-cbl-mariner-distroless-arm64v8": {}, - "$(monitor|6.3|minor-tag)-cbl-mariner-distroless-arm64v8": {}, - "$(monitor|6|major-tag)-cbl-mariner-distroless-arm64v8": {} + "$(monitor|6.3|fixed-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|6.3|minor-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|6|major-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } @@ -9260,8 +9308,12 @@ "os": "linux", "osVersion": "jammy-chiseled", "tags": { - "$(monitor|8.0|fixed-tag)-ubuntu-chiseled-amd64": {}, - "$(monitor|8.0|minor-tag)-ubuntu-chiseled-amd64": {} + "$(monitor|8.0|fixed-tag)-ubuntu-chiseled-amd64": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-ubuntu-chiseled-amd64": { + "docType": "Undocumented" + } } }, { @@ -9274,8 +9326,12 @@ "os": "linux", "osVersion": "jammy-chiseled", "tags": { - "$(monitor|8.0|fixed-tag)-ubuntu-chiseled-arm64v8": {}, - "$(monitor|8.0|minor-tag)-ubuntu-chiseled-arm64v8": {} + "$(monitor|8.0|fixed-tag)-ubuntu-chiseled-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-ubuntu-chiseled-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" } @@ -9297,8 +9353,12 @@ "os": "linux", "osVersion": "cbl-mariner2.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)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-amd64": { + "docType": "Undocumented" + } } }, { @@ -9311,8 +9371,12 @@ "os": "linux", "osVersion": "cbl-mariner2.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)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + }, + "$(monitor|8.0|minor-tag)-cbl-mariner-distroless-arm64v8": { + "docType": "Undocumented" + } }, "variant": "v8" }