Skip to content

Commit

Permalink
Undocument .NET Monitor 6.3 and 8.0 arch-specific tags (dotnet#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 committed Oct 7, 2024
1 parent f994791 commit 599ae70
Show file tree
Hide file tree
Showing 3 changed files with 134 additions and 62 deletions.
24 changes: 12 additions & 12 deletions README.monitor.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,24 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how
Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.0-rc.1-amd64, 9.0-amd64, 9.0.0-rc.1, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/9.0/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
8.0.5-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8-ubuntu-chiseled-amd64, 8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8-ubuntu-chiseled, 8.0.5, 8.0, 8, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/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-cbl-mariner-distroless-amd64, 8.0.5-cbl-mariner-distroless, 8.0-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
6.3.9-alpine-amd64, 6.3-alpine-amd64, 6-alpine-amd64, 6.3.9-alpine, 6.3-alpine, 6-alpine, 6.3.9, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.20
6.3.9-ubuntu-chiseled-amd64, 6.3-ubuntu-chiseled-amd64, 6-ubuntu-chiseled-amd64, 6.3.9-ubuntu-chiseled, 6.3-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
6.3.9-cbl-mariner-amd64, 6.3-cbl-mariner-amd64, 6-cbl-mariner-amd64, 6.3.9-cbl-mariner, 6.3-cbl-mariner, 6-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/cbl-mariner/amd64/Dockerfile) | CBL-Mariner 2.0
6.3.9-cbl-mariner-distroless-amd64, 6.3-cbl-mariner-distroless-amd64, 6-cbl-mariner-distroless-amd64, 6.3.9-cbl-mariner-distroless, 6.3-cbl-mariner-distroless, 6-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8-ubuntu-chiseled, 8.0.5, 8.0, 8, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.5-cbl-mariner-distroless, 8.0-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
6.3.9-alpine, 6.3-alpine, 6-alpine, 6.3.9, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.20
6.3.9-ubuntu-chiseled, 6.3-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
6.3.9-cbl-mariner, 6.3-cbl-mariner, 6-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/cbl-mariner/amd64/Dockerfile) | CBL-Mariner 2.0
6.3.9-cbl-mariner-distroless, 6.3-cbl-mariner-distroless, 6-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0

### Linux arm64 Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.0-rc.1-arm64v8, 9.0-arm64v8, 9.0.0-rc.1, 9.0, 9 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/9.0/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
8.0.5-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8-ubuntu-chiseled-arm64v8, 8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8-ubuntu-chiseled, 8.0.5, 8.0, 8, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/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-cbl-mariner-distroless-arm64v8, 8.0.5-cbl-mariner-distroless, 8.0-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
6.3.9-alpine-arm64v8, 6.3-alpine-arm64v8, 6-alpine-arm64v8, 6.3.9-alpine, 6.3-alpine, 6-alpine, 6.3.9, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.20
6.3.9-ubuntu-chiseled-arm64v8, 6.3-ubuntu-chiseled-arm64v8, 6-ubuntu-chiseled-arm64v8, 6.3.9-ubuntu-chiseled, 6.3-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
6.3.9-cbl-mariner-arm64v8, 6.3-cbl-mariner-arm64v8, 6-cbl-mariner-arm64v8, 6.3.9-cbl-mariner, 6.3-cbl-mariner, 6-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile) | CBL-Mariner 2.0
6.3.9-cbl-mariner-distroless-arm64v8, 6.3-cbl-mariner-distroless-arm64v8, 6-cbl-mariner-distroless-arm64v8, 6.3.9-cbl-mariner-distroless, 6.3-cbl-mariner-distroless, 6-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
8.0.5-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8-ubuntu-chiseled, 8.0.5, 8.0, 8, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.5-cbl-mariner-distroless, 8.0-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
6.3.9-alpine, 6.3-alpine, 6-alpine, 6.3.9, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.20
6.3.9-ubuntu-chiseled, 6.3-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
6.3.9-cbl-mariner, 6.3-cbl-mariner, 6-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile) | CBL-Mariner 2.0
6.3.9-cbl-mariner-distroless, 6.3-cbl-mariner-distroless, 6-cbl-mariner-distroless | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
<!--End of generated tags-->

*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.*
Expand Down
28 changes: 14 additions & 14 deletions eng/mcr-tags-metadata-templates/monitor-tags.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
$(McrTagsYmlRepo:monitor)
$(McrTagsYmlTagGroup:9.0-amd64)
$(McrTagsYmlTagGroup:9.0-arm64v8)
$(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:9.0)
$(McrTagsYmlTagGroup:9)
$(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.9-alpine)
$(McrTagsYmlTagGroup:6.3.9-ubuntu-chiseled)
$(McrTagsYmlTagGroup:6.3.9-cbl-mariner)
$(McrTagsYmlTagGroup:6.3.9-cbl-mariner-distroless)
$(McrTagsYmlTagGroup:6.3-alpine)
$(McrTagsYmlTagGroup:6.3-ubuntu-chiseled)
$(McrTagsYmlTagGroup:6.3-cbl-mariner)
$(McrTagsYmlTagGroup:6.3-cbl-mariner-distroless)
144 changes: 108 additions & 36 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -8179,9 +8179,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 @@ -8194,9 +8200,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 @@ -8219,9 +8231,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 @@ -8234,9 +8252,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 @@ -8259,9 +8283,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 @@ -8274,9 +8304,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 @@ -8299,9 +8335,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 @@ -8314,9 +8356,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 @@ -8343,9 +8391,15 @@
"os": "linux",
"osVersion": "jammy-chiseled",
"tags": {
"$(monitor|8.0|fixed-tag)-ubuntu-chiseled-amd64": {},
"$(monitor|8.0|minor-tag)-ubuntu-chiseled-amd64": {},
"$(monitor|8|major-tag)-ubuntu-chiseled-amd64": {}
"$(monitor|8.0|fixed-tag)-ubuntu-chiseled-amd64": {
"docType": "Undocumented"
},
"$(monitor|8.0|minor-tag)-ubuntu-chiseled-amd64": {
"docType": "Undocumented"
},
"$(monitor|8|major-tag)-ubuntu-chiseled-amd64": {
"docType": "Undocumented"
}
}
},
{
Expand All @@ -8358,9 +8412,15 @@
"os": "linux",
"osVersion": "jammy-chiseled",
"tags": {
"$(monitor|8.0|fixed-tag)-ubuntu-chiseled-arm64v8": {},
"$(monitor|8.0|minor-tag)-ubuntu-chiseled-arm64v8": {},
"$(monitor|8|major-tag)-ubuntu-chiseled-arm64v8": {}
"$(monitor|8.0|fixed-tag)-ubuntu-chiseled-arm64v8": {
"docType": "Undocumented"
},
"$(monitor|8.0|minor-tag)-ubuntu-chiseled-arm64v8": {
"docType": "Undocumented"
},
"$(monitor|8|major-tag)-ubuntu-chiseled-arm64v8": {
"docType": "Undocumented"
}
},
"variant": "v8"
}
Expand All @@ -8383,9 +8443,15 @@
"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|major-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"
},
"$(monitor|8|major-tag)-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
}
}
},
{
Expand All @@ -8398,9 +8464,15 @@
"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|major-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"
},
"$(monitor|8|major-tag)-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented"
}
},
"variant": "v8"
}
Expand Down

0 comments on commit 599ae70

Please sign in to comment.