Skip to content

Commit

Permalink
Undocument .NET Monitor 6.3 and 8.0 arch-specific tags (#5954)
Browse files Browse the repository at this point in the history
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
  • Loading branch information
jander-msft and lbussell authored Oct 7, 2024
1 parent 68bee35 commit 4433e06
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 56 deletions.
24 changes: 12 additions & 12 deletions README.monitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -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, 9.0, 9, latest | [Dockerfile](src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
8.0.5-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.5, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.5-cbl-mariner-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8.0.5-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.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.5, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.5-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

Expand All @@ -82,12 +82,12 @@ Tags | Dockerfile | OS Version
Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.0-rc.2, 9.0, 9, latest | [Dockerfile](src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
8.0.5-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.5, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.5-cbl-mariner-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8.0.5-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.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.5, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.5-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

Expand Down
24 changes: 12 additions & 12 deletions eng/mcr-tags-metadata-templates/monitor-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.5-ubuntu-chiseled)
$(McrTagsYmlTagGroup:8.0.5-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)
128 changes: 96 additions & 32 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
{
Expand All @@ -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"
}
Expand All @@ -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"
}
}
},
{
Expand All @@ -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"
}
Expand All @@ -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"
}
}
},
{
Expand All @@ -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"
}
Expand All @@ -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"
}
}
},
{
Expand All @@ -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"
}
Expand All @@ -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"
}
}
},
{
Expand All @@ -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"
}
Expand All @@ -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"
}
}
},
{
Expand All @@ -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"
}
Expand Down

0 comments on commit 4433e06

Please sign in to comment.