dotnet
/
dotnet-docker
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add .NET Monitor 6.3 images; move Ubuntu Chiseled to 6.3 (#4089)

This commit is contained in:
Justin Anderson 2022-09-26 06:14:46 -07:00 коммит произвёл GitHub
Родитель 33fe58c5ae
Коммит 9803c4af67
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
15 изменённых файлов: 595 добавлений и 77 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
README.monitor.md
Просмотреть файл

@ -50,26 +50,28 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how
## Linux amd64 Tags ## Linux amd64 Tags
Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version
-----------| -------------| ------------- -----------| -------------| -------------
6.2.2-alpine-amd64, 6.2-alpine-amd64, 6-alpine-amd64, 6.2.2-alpine, 6.2-alpine, 6-alpine, 6.2.2, 6.2, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.2/alpine/amd64/Dockerfile) | Alpine 3.16 6.3.0-alpha.1-alpine-amd64, 6.3-alpine-amd64, 6-alpine-amd64, 6.3.0-alpha.1-alpine, 6.3-alpine, 6-alpine, 6.3.0-alpha.1, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.16
6.3.0-alpha.1-ubuntu-chiseled-amd64, 6.3-ubuntu-chiseled-amd64, 6-ubuntu-chiseled-amd64, 6.3.0-alpha.1-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.2.2-alpine-amd64, 6.2-alpine-amd64, 6.2.2-alpine, 6.2-alpine, 6.2.2, 6.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.2/alpine/amd64/Dockerfile) | Alpine 3.16
##### .NET Monitor Preview Tags ##### .NET Monitor Preview Tags
Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version
-----------| -------------| ------------- -----------| -------------| -------------
7.0.0-rc.1-alpine-amd64, 7.0-alpine-amd64, 7-alpine-amd64, 7.0.0-rc.1-alpine, 7.0-alpine, 7-alpine, 7.0.0-rc.1, 7.0, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/7.0/alpine/amd64/Dockerfile) | Alpine 3.16 7.0.0-rc.1-alpine-amd64, 7.0-alpine-amd64, 7-alpine-amd64, 7.0.0-rc.1-alpine, 7.0-alpine, 7-alpine, 7.0.0-rc.1, 7.0, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/7.0/alpine/amd64/Dockerfile) | Alpine 3.16
7.0.0-rc.1-ubuntu-chiseled-amd64, 7.0-ubuntu-chiseled-amd64, 7-ubuntu-chiseled-amd64, 7.0.0-rc.1-ubuntu-chiseled, 7.0-ubuntu-chiseled, 7-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/7.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04 7.0.0-rc.1-ubuntu-chiseled-amd64, 7.0-ubuntu-chiseled-amd64, 7-ubuntu-chiseled-amd64, 7.0.0-rc.1-ubuntu-chiseled, 7.0-ubuntu-chiseled, 7-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/7.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
6.2.2-ubuntu-chiseled-amd64, 6.2-ubuntu-chiseled-amd64, 6-ubuntu-chiseled-amd64, 6.2.2-ubuntu-chiseled, 6.2-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.2/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
## Linux arm64 Tags ## Linux arm64 Tags
Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version
-----------| -------------| ------------- -----------| -------------| -------------
6.2.2-alpine-arm64v8, 6.2-alpine-arm64v8, 6.2.2-alpine, 6.2-alpine, 6-alpine, 6.2.2, 6.2, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.2/alpine/arm64v8/Dockerfile) | Alpine 3.16 6.3.0-alpha.1-alpine-arm64v8, 6.3-alpine-arm64v8, 6.3.0-alpha.1-alpine, 6.3-alpine, 6-alpine, 6.3.0-alpha.1, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.16
6.3.0-alpha.1-ubuntu-chiseled-arm64v8, 6.3-ubuntu-chiseled-arm64v8, 6-ubuntu-chiseled-arm64v8, 6.3.0-alpha.1-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.2.2-alpine-arm64v8, 6.2-alpine-arm64v8, 6.2.2-alpine, 6.2-alpine, 6.2.2, 6.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.2/alpine/arm64v8/Dockerfile) | Alpine 3.16
##### .NET Monitor Preview Tags ##### .NET Monitor Preview Tags
Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version
-----------| -------------| ------------- -----------| -------------| -------------
7.0.0-rc.1-alpine-arm64v8, 7.0-alpine-arm64v8, 7-alpine-arm64v8, 7.0.0-rc.1-alpine, 7.0-alpine, 7-alpine, 7.0.0-rc.1, 7.0, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/7.0/alpine/arm64v8/Dockerfile) | Alpine 3.16 7.0.0-rc.1-alpine-arm64v8, 7.0-alpine-arm64v8, 7-alpine-arm64v8, 7.0.0-rc.1-alpine, 7.0-alpine, 7-alpine, 7.0.0-rc.1, 7.0, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/7.0/alpine/arm64v8/Dockerfile) | Alpine 3.16
7.0.0-rc.1-ubuntu-chiseled-arm64v8, 7.0-ubuntu-chiseled-arm64v8, 7-ubuntu-chiseled-arm64v8, 7.0.0-rc.1-ubuntu-chiseled, 7.0-ubuntu-chiseled, 7-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/7.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04 7.0.0-rc.1-ubuntu-chiseled-arm64v8, 7.0-ubuntu-chiseled-arm64v8, 7-ubuntu-chiseled-arm64v8, 7.0.0-rc.1-ubuntu-chiseled, 7.0-ubuntu-chiseled, 7-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/7.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
6.2.2-ubuntu-chiseled-arm64v8, 6.2-ubuntu-chiseled-arm64v8, 6-ubuntu-chiseled-arm64v8, 6.2.2-ubuntu-chiseled, 6.2-ubuntu-chiseled, 6-ubuntu-chiseled | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/nightly/src/monitor/6.2/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
You can retrieve a list of all available tags for dotnet/nightly/monitor at https://mcr.microsoft.com/v2/dotnet/nightly/monitor/tags/list. You can retrieve a list of all available tags for dotnet/nightly/monitor at https://mcr.microsoft.com/v2/dotnet/nightly/monitor/tags/list.
<!--End of generated tags--> <!--End of generated tags-->

8
eng/mcr-tags-metadata-templates/monitor-tags.yml
Просмотреть файл

@ -7,9 +7,9 @@ $(McrTagsYmlTagGroup:7.0-ubuntu-chiseled-amd64)
customSubTableTitle: .NET Monitor Preview Tags customSubTableTitle: .NET Monitor Preview Tags
$(McrTagsYmlTagGroup:7.0-ubuntu-chiseled-arm64v8) $(McrTagsYmlTagGroup:7.0-ubuntu-chiseled-arm64v8)
customSubTableTitle: .NET Monitor Preview Tags customSubTableTitle: .NET Monitor Preview Tags
$(McrTagsYmlTagGroup:6.3-alpine-amd64)
$(McrTagsYmlTagGroup:6.3-alpine-arm64v8)
$(McrTagsYmlTagGroup:6.3-ubuntu-chiseled-amd64)
$(McrTagsYmlTagGroup:6.3-ubuntu-chiseled-arm64v8)
$(McrTagsYmlTagGroup:6.2-alpine-amd64) $(McrTagsYmlTagGroup:6.2-alpine-amd64)
$(McrTagsYmlTagGroup:6.2-alpine-arm64v8) $(McrTagsYmlTagGroup:6.2-alpine-arm64v8)
$(McrTagsYmlTagGroup:6.2-ubuntu-chiseled-amd64)
customSubTableTitle: .NET Monitor Preview Tags
$(McrTagsYmlTagGroup:6.2-ubuntu-chiseled-arm64v8)
customSubTableTitle: .NET Monitor Preview Tags

261
manifest.json
Просмотреть файл

@ -5228,10 +5228,8 @@
"sharedTags": { "sharedTags": {
"$(monitor|6.2|product-version)-alpine": {}, "$(monitor|6.2|product-version)-alpine": {},
"6.2-alpine": {}, "6.2-alpine": {},
"6-alpine": {},
"$(monitor|6.2|product-version)": {}, "$(monitor|6.2|product-version)": {},
"6.2": {}, "6.2": {}
"6": {}
}, },
"platforms": [ "platforms": [
{ {
@ -5245,8 +5243,7 @@
"osVersion": "alpine3.16", "osVersion": "alpine3.16",
"tags": { "tags": {
"$(monitor|6.2|product-version)-alpine-amd64": {}, "$(monitor|6.2|product-version)-alpine-amd64": {},
"6.2-alpine-amd64": {}, "6.2-alpine-amd64": {}
"6-alpine-amd64": {}
} }
}, },
{ {
@ -5267,48 +5264,6 @@
} }
] ]
}, },
{
"productVersion": "$(monitor|6.2|product-version)",
"sharedTags": {
"$(monitor|6.2|product-version)-ubuntu-chiseled": {},
"6.2-ubuntu-chiseled": {},
"6-ubuntu-chiseled": {}
},
"platforms": [
{
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.2/ubuntu-chiseled/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "jammy-chiseled",
"tags": {
"$(monitor|6.2|product-version)-ubuntu-chiseled-amd64": {},
"6.2-ubuntu-chiseled-amd64": {},
"6-ubuntu-chiseled-amd64": {}
}
},
{
"architecture": "arm64",
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.2/ubuntu-chiseled/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "jammy-chiseled",
"tags": {
"$(monitor|6.2|product-version)-ubuntu-chiseled-arm64v8": {},
"6.2-ubuntu-chiseled-arm64v8": {},
"6-ubuntu-chiseled-arm64v8": {}
},
"variant": "v8"
}
]
},
{ {
"productVersion": "$(monitor|6.2|product-version)", "productVersion": "$(monitor|6.2|product-version)",
"sharedTags": { "sharedTags": {
@ -5317,9 +5272,6 @@
}, },
"6.2-cbl-mariner": { "6.2-cbl-mariner": {
"docType": "Undocumented" "docType": "Undocumented"
},
"6-cbl-mariner": {
"docType": "Undocumented"
} }
}, },
"platforms": [ "platforms": [
@ -5338,9 +5290,6 @@
}, },
"6.2-cbl-mariner-amd64": { "6.2-cbl-mariner-amd64": {
"docType": "Undocumented" "docType": "Undocumented"
},
"6-cbl-mariner-amd64": {
"docType": "Undocumented"
} }
} }
}, },
@ -5374,9 +5323,6 @@
}, },
"6.2-cbl-mariner-distroless": { "6.2-cbl-mariner-distroless": {
"docType": "Undocumented" "docType": "Undocumented"
},
"6-cbl-mariner-distroless": {
"docType": "Undocumented"
} }
}, },
"platforms": [ "platforms": [
@ -5395,9 +5341,6 @@
}, },
"6.2-cbl-mariner-distroless-amd64": { "6.2-cbl-mariner-distroless-amd64": {
"docType": "Undocumented" "docType": "Undocumented"
},
"6-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
} }
} }
}, },
@ -5417,6 +5360,206 @@
}, },
"6.2-cbl-mariner-distroless-arm64v8": { "6.2-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented" "docType": "Undocumented"
}
},
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|6.3|product-version)",
"sharedTags": {
"$(monitor|6.3|product-version)-alpine": {},
"6.3-alpine": {},
"6-alpine": {},
"$(monitor|6.3|product-version)": {},
"6.3": {},
"6": {}
},
"platforms": [
{
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.3/alpine/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(monitor|6.3|product-version)-alpine-amd64": {},
"6.3-alpine-amd64": {},
"6-alpine-amd64": {}
}
},
{
"architecture": "arm64",
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.3/alpine/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "alpine3.16",
"tags": {
"$(monitor|6.3|product-version)-alpine-arm64v8": {},
"6.3-alpine-arm64v8": {}
},
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|6.3|product-version)",
"sharedTags": {
"$(monitor|6.3|product-version)-ubuntu-chiseled": {},
"6.3-ubuntu-chiseled": {},
"6-ubuntu-chiseled": {}
},
"platforms": [
{
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.3/ubuntu-chiseled/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "jammy-chiseled",
"tags": {
"$(monitor|6.3|product-version)-ubuntu-chiseled-amd64": {},
"6.3-ubuntu-chiseled-amd64": {},
"6-ubuntu-chiseled-amd64": {}
}
},
{
"architecture": "arm64",
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.3/ubuntu-chiseled/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "jammy-chiseled",
"tags": {
"$(monitor|6.3|product-version)-ubuntu-chiseled-arm64v8": {},
"6.3-ubuntu-chiseled-arm64v8": {},
"6-ubuntu-chiseled-arm64v8": {}
},
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|6.3|product-version)",
"sharedTags": {
"$(monitor|6.3|product-version)-cbl-mariner": {
"docType": "Undocumented"
},
"6.3-cbl-mariner": {
"docType": "Undocumented"
},
"6-cbl-mariner": {
"docType": "Undocumented"
}
},
"platforms": [
{
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.3/cbl-mariner/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "cbl-mariner2.0",
"tags": {
"$(monitor|6.3|product-version)-cbl-mariner-amd64": {
"docType": "Undocumented"
},
"6.3-cbl-mariner-amd64": {
"docType": "Undocumented"
},
"6-cbl-mariner-amd64": {
"docType": "Undocumented"
}
}
},
{
"architecture": "arm64",
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.3/cbl-mariner/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "cbl-mariner2.0",
"tags": {
"$(monitor|6.3|product-version)-cbl-mariner-arm64v8": {
"docType": "Undocumented"
},
"6.3-cbl-mariner-arm64v8": {
"docType": "Undocumented"
}
},
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|6.3|product-version)",
"sharedTags": {
"$(monitor|6.3|product-version)-cbl-mariner-distroless": {
"docType": "Undocumented"
},
"6.3-cbl-mariner-distroless": {
"docType": "Undocumented"
},
"6-cbl-mariner-distroless": {
"docType": "Undocumented"
}
},
"platforms": [
{
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.3/cbl-mariner-distroless/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "cbl-mariner2.0-distroless",
"tags": {
"$(monitor|6.3|product-version)-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
},
"6.3-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
},
"6-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
}
}
},
{
"architecture": "arm64",
"buildArgs": {
"ASPNET_REPO": "$(Repo:aspnet)",
"SDK_REPO": "$(Repo:sdk)"
},
"dockerfile": "src/monitor/6.3/cbl-mariner-distroless/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile",
"os": "linux",
"osVersion": "cbl-mariner2.0-distroless",
"tags": {
"$(monitor|6.3|product-version)-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented"
},
"6.3-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented"
}, },
"6-cbl-mariner-distroless-arm64v8": { "6-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented" "docType": "Undocumented"

6
manifest.versions.json
Просмотреть файл

@ -63,6 +63,8 @@
"base-url|6.2-monitor|main": "$(base-url|public|main)", "base-url|6.2-monitor|main": "$(base-url|public|main)",
"base-url|6.2-monitor|nightly": "$(base-url|public|nightly)", "base-url|6.2-monitor|nightly": "$(base-url|public|nightly)",
"base-url|6.3-monitor|main": "$(base-url|public|main)",
"base-url|6.3-monitor|nightly": "$(base-url|public|nightly)",
"base-url|7.0-monitor|main": "$(base-url|public|main)", "base-url|7.0-monitor|main": "$(base-url|public|main)",
"base-url|7.0-monitor|nightly": "$(base-url|public|nightly)", "base-url|7.0-monitor|nightly": "$(base-url|public|nightly)",
@ -89,6 +91,10 @@
"monitor|6.2|product-version": "6.2.2", "monitor|6.2|product-version": "6.2.2",
"monitor|6.2|sha": "5d5df17e81ed66e644dc7323e89caee10f7eadbf62a28e0443e9fe12df1c5283fce2ebf6bc4dc2e5004c3c9e044101fc131ff293f382f15a32c91a6e159619d7", "monitor|6.2|sha": "5d5df17e81ed66e644dc7323e89caee10f7eadbf62a28e0443e9fe12df1c5283fce2ebf6bc4dc2e5004c3c9e044101fc131ff293f382f15a32c91a6e159619d7",
"monitor|6.3|build-version": "6.3.0-alpha.1.22472.4",
"monitor|6.3|product-version": "6.3.0-alpha.1",
"monitor|6.3|sha": "74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0",
"monitor|7.0|build-version": "7.0.0-rc.1.22472.3", "monitor|7.0|build-version": "7.0.0-rc.1.22472.3",
"monitor|7.0|product-version": "7.0.0-rc.1", "monitor|7.0|product-version": "7.0.0-rc.1",
"monitor|7.0|sha": "e32f2fd005cd9c1bce8f7d4e12765b1196cfa3232a441d73f2fc20229f0bd4e365e8de544c4164f0d6e0a6d3916393c10d19e9c3b5415af3cc10e329113a2444", "monitor|7.0|sha": "e32f2fd005cd9c1bce8f7d4e12765b1196cfa3232a441d73f2fc20229f0bd4e365e8de544c4164f0d6e0a6d3916393c10d19e9c3b5415af3cc10e329113a2444",

59
src/monitor/6.3/alpine/amd64/Dockerfile Normal file
Просмотреть файл

@ -0,0 +1,59 @@
ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
# Installer image
FROM $SDK_REPO:6.0.401-alpine3.16-amd64 AS installer
# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.3.0-alpha.1.22472.4
RUN wget -O dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$DOTNET_MONITOR_VERSION/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \
&& dotnetmonitor_sha512='74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0' \
&& echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \
&& dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \
# To reduce image size, remove all non-net6.0 TFMs
# To do this safely, we need to first find everything that dotnet tool installed named "dotnet-monitor".
# The /dotnet-monitor/ folder exists under .store which is not a stable constant to rely on. The result is multi stage search:
# 1. Find any files in /app
# 2. Match anything that is under a *folder* called 'dotnet-monitor'
# 3. Match anything from step 2 that isn't in a '/tools/net6.0' folder (/tools is the folder we use in a nuget file that is stable)
# 4. Delete everything from step 3
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -v -i '.*/tools/net6[.]0' | xargs rm -rf \
# To reduce image size further, remove the non-linux assemblies
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(win|osx)' | xargs rm -rf \
# To reduce image size further, remove linux assemblies that do not match the x64 architecture
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(linux-arm64|linux-musl-arm64)' | xargs rm -rf \
# To reduce image size further, remove symbol files
&& find /app -type f \( -name *.pdb -o -name *.dbg \) -print | xargs rm -rf \
# Remove all the empty directories left by the previous step
&& find /app -type d -empty -delete \
# Allow other users to run the tool
&& chmod 755 /app/dotnet-monitor \
&& rm dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg
# Monitor image
FROM $ASPNET_REPO:6.0.9-alpine3.16-amd64
WORKDIR /app
COPY --from=installer /app .
ENV \
# Unset ASPNETCORE_URLS from aspnet base image
ASPNETCORE_URLS= \
# 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 \
# 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", "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

59
src/monitor/6.3/alpine/arm64v8/Dockerfile Normal file
Просмотреть файл

@ -0,0 +1,59 @@
ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
# Installer image
FROM $SDK_REPO:6.0.401-alpine3.16-arm64v8 AS installer
# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.3.0-alpha.1.22472.4
RUN wget -O dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$DOTNET_MONITOR_VERSION/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \
&& dotnetmonitor_sha512='74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0' \
&& echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \
&& dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \
# To reduce image size, remove all non-net6.0 TFMs
# To do this safely, we need to first find everything that dotnet tool installed named "dotnet-monitor".
# The /dotnet-monitor/ folder exists under .store which is not a stable constant to rely on. The result is multi stage search:
# 1. Find any files in /app
# 2. Match anything that is under a *folder* called 'dotnet-monitor'
# 3. Match anything from step 2 that isn't in a '/tools/net6.0' folder (/tools is the folder we use in a nuget file that is stable)
# 4. Delete everything from step 3
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -v -i '.*/tools/net6[.]0' | xargs rm -rf \
# To reduce image size further, remove the non-linux assemblies
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(win|osx)' | xargs rm -rf \
# To reduce image size further, remove linux assemblies that do not match the arm64 architecture
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(linux-x64|linux-musl-x64)' | xargs rm -rf \
# To reduce image size further, remove symbol files
&& find /app -type f \( -name *.pdb -o -name *.dbg \) -print | xargs rm -rf \
# Remove all the empty directories left by the previous step
&& find /app -type d -empty -delete \
# Allow other users to run the tool
&& chmod 755 /app/dotnet-monitor \
&& rm dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg
# Monitor image
FROM $ASPNET_REPO:6.0.9-alpine3.16-arm64v8
WORKDIR /app
COPY --from=installer /app .
ENV \
# Unset ASPNETCORE_URLS from aspnet base image
ASPNETCORE_URLS= \
# 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 \
# 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", "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

59
src/monitor/6.3/cbl-mariner-distroless/amd64/Dockerfile Normal file
Просмотреть файл

@ -0,0 +1,59 @@
ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
# Installer image
FROM $SDK_REPO:6.0.401-cbl-mariner2.0-amd64 AS installer
# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.3.0-alpha.1.22472.4
RUN curl -fSL --output dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$DOTNET_MONITOR_VERSION/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \
&& dotnetmonitor_sha512='74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0' \
&& echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \
&& dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \
# To reduce image size, remove all non-net6.0 TFMs
# To do this safely, we need to first find everything that dotnet tool installed named "dotnet-monitor".
# The /dotnet-monitor/ folder exists under .store which is not a stable constant to rely on. The result is multi stage search:
# 1. Find any files in /app
# 2. Match anything that is under a *folder* called 'dotnet-monitor'
# 3. Match anything from step 2 that isn't in a '/tools/net6.0' folder (/tools is the folder we use in a nuget file that is stable)
# 4. Delete everything from step 3
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -v -i '.*/tools/net6[.]0' | xargs rm -rf \
# To reduce image size further, remove the non-linux assemblies
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(win|osx)' | xargs rm -rf \
# To reduce image size further, remove linux assemblies that do not match the x64 architecture
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(linux-arm64|linux-musl-arm64)' | xargs rm -rf \
# To reduce image size further, remove symbol files
&& find /app -type f \( -name *.pdb -o -name *.dbg \) -print | xargs rm -rf \
# Remove all the empty directories left by the previous step
&& find /app -type d -empty -delete \
# Allow other users to run the tool
&& chmod 755 /app/dotnet-monitor \
&& rm dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg
# Monitor image
FROM $ASPNET_REPO:6.0.9-cbl-mariner2.0-distroless-amd64
WORKDIR /app
COPY --from=installer /app .
ENV \
# Unset ASPNETCORE_URLS from aspnet base image
ASPNETCORE_URLS= \
# 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 \
# 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", "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

59
src/monitor/6.3/cbl-mariner-distroless/arm64v8/Dockerfile Normal file
Просмотреть файл

@ -0,0 +1,59 @@
ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
# Installer image
FROM $SDK_REPO:6.0.401-cbl-mariner2.0-arm64v8 AS installer
# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.3.0-alpha.1.22472.4
RUN curl -fSL --output dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$DOTNET_MONITOR_VERSION/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \
&& dotnetmonitor_sha512='74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0' \
&& echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \
&& dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \
# To reduce image size, remove all non-net6.0 TFMs
# To do this safely, we need to first find everything that dotnet tool installed named "dotnet-monitor".
# The /dotnet-monitor/ folder exists under .store which is not a stable constant to rely on. The result is multi stage search:
# 1. Find any files in /app
# 2. Match anything that is under a *folder* called 'dotnet-monitor'
# 3. Match anything from step 2 that isn't in a '/tools/net6.0' folder (/tools is the folder we use in a nuget file that is stable)
# 4. Delete everything from step 3
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -v -i '.*/tools/net6[.]0' | xargs rm -rf \
# To reduce image size further, remove the non-linux assemblies
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(win|osx)' | xargs rm -rf \
# To reduce image size further, remove linux assemblies that do not match the arm64 architecture
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(linux-x64|linux-musl-x64)' | xargs rm -rf \
# To reduce image size further, remove symbol files
&& find /app -type f \( -name *.pdb -o -name *.dbg \) -print | xargs rm -rf \
# Remove all the empty directories left by the previous step
&& find /app -type d -empty -delete \
# Allow other users to run the tool
&& chmod 755 /app/dotnet-monitor \
&& rm dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg
# Monitor image
FROM $ASPNET_REPO:6.0.9-cbl-mariner2.0-distroless-arm64v8
WORKDIR /app
COPY --from=installer /app .
ENV \
# Unset ASPNETCORE_URLS from aspnet base image
ASPNETCORE_URLS= \
# 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 \
# 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", "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

59
src/monitor/6.3/cbl-mariner/amd64/Dockerfile Normal file
Просмотреть файл

@ -0,0 +1,59 @@
ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
# Installer image
FROM $SDK_REPO:6.0.401-cbl-mariner2.0-amd64 AS installer
# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.3.0-alpha.1.22472.4
RUN curl -fSL --output dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$DOTNET_MONITOR_VERSION/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \
&& dotnetmonitor_sha512='74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0' \
&& echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \
&& dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \
# To reduce image size, remove all non-net6.0 TFMs
# To do this safely, we need to first find everything that dotnet tool installed named "dotnet-monitor".
# The /dotnet-monitor/ folder exists under .store which is not a stable constant to rely on. The result is multi stage search:
# 1. Find any files in /app
# 2. Match anything that is under a *folder* called 'dotnet-monitor'
# 3. Match anything from step 2 that isn't in a '/tools/net6.0' folder (/tools is the folder we use in a nuget file that is stable)
# 4. Delete everything from step 3
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -v -i '.*/tools/net6[.]0' | xargs rm -rf \
# To reduce image size further, remove the non-linux assemblies
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(win|osx)' | xargs rm -rf \
# To reduce image size further, remove linux assemblies that do not match the x64 architecture
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(linux-arm64|linux-musl-arm64)' | xargs rm -rf \
# To reduce image size further, remove symbol files
&& find /app -type f \( -name *.pdb -o -name *.dbg \) -print | xargs rm -rf \
# Remove all the empty directories left by the previous step
&& find /app -type d -empty -delete \
# Allow other users to run the tool
&& chmod 755 /app/dotnet-monitor \
&& rm dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg
# Monitor image
FROM $ASPNET_REPO:6.0.9-cbl-mariner2.0-amd64
WORKDIR /app
COPY --from=installer /app .
ENV \
# Unset ASPNETCORE_URLS from aspnet base image
ASPNETCORE_URLS= \
# 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 \
# 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", "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

59
src/monitor/6.3/cbl-mariner/arm64v8/Dockerfile Normal file
Просмотреть файл

@ -0,0 +1,59 @@
ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet
ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
# Installer image
FROM $SDK_REPO:6.0.401-cbl-mariner2.0-arm64v8 AS installer
# Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.3.0-alpha.1.22472.4
RUN curl -fSL --output dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$DOTNET_MONITOR_VERSION/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \
&& dotnetmonitor_sha512='74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0' \
&& echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \
&& dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \
# To reduce image size, remove all non-net6.0 TFMs
# To do this safely, we need to first find everything that dotnet tool installed named "dotnet-monitor".
# The /dotnet-monitor/ folder exists under .store which is not a stable constant to rely on. The result is multi stage search:
# 1. Find any files in /app
# 2. Match anything that is under a *folder* called 'dotnet-monitor'
# 3. Match anything from step 2 that isn't in a '/tools/net6.0' folder (/tools is the folder we use in a nuget file that is stable)
# 4. Delete everything from step 3
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -v -i '.*/tools/net6[.]0' | xargs rm -rf \
# To reduce image size further, remove the non-linux assemblies
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(win|osx)' | xargs rm -rf \
# To reduce image size further, remove linux assemblies that do not match the arm64 architecture
&& find /app -type f -print | grep -i '.*/dotnet-monitor/.*' | grep -i -E '/(runtimes|shared|shims)/(linux-x64|linux-musl-x64)' | xargs rm -rf \
# To reduce image size further, remove symbol files
&& find /app -type f \( -name *.pdb -o -name *.dbg \) -print | xargs rm -rf \
# Remove all the empty directories left by the previous step
&& find /app -type d -empty -delete \
# Allow other users to run the tool
&& chmod 755 /app/dotnet-monitor \
&& rm dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg
# Monitor image
FROM $ASPNET_REPO:6.0.9-cbl-mariner2.0-arm64v8
WORKDIR /app
COPY --from=installer /app .
ENV \
# Unset ASPNETCORE_URLS from aspnet base image
ASPNETCORE_URLS= \
# 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 \
# 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", "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

6
src/monitor/6.2/ubuntu-chiseled/amd64/Dockerfile → src/monitor/6.3/ubuntu-chiseled/amd64/Dockerfile
Просмотреть файл

@ -5,9 +5,9 @@ ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
FROM $SDK_REPO:6.0.401-jammy-amd64 AS installer FROM $SDK_REPO:6.0.401-jammy-amd64 AS installer
# Install .NET Monitor # Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.2.2 ENV DOTNET_MONITOR_VERSION=6.3.0-alpha.1.22472.4
RUN curl -fSL --output dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/6.2.2-servicing.22401.2/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \ RUN curl -fSL --output dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$DOTNET_MONITOR_VERSION/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \
&& dotnetmonitor_sha512='5d5df17e81ed66e644dc7323e89caee10f7eadbf62a28e0443e9fe12df1c5283fce2ebf6bc4dc2e5004c3c9e044101fc131ff293f382f15a32c91a6e159619d7' \ && dotnetmonitor_sha512='74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0' \
&& echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \ && echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \
&& dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \ && dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \
# To reduce image size, remove all non-net6.0 TFMs # To reduce image size, remove all non-net6.0 TFMs

6
src/monitor/6.2/ubuntu-chiseled/arm64v8/Dockerfile → src/monitor/6.3/ubuntu-chiseled/arm64v8/Dockerfile
Просмотреть файл

@ -5,9 +5,9 @@ ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk
FROM $SDK_REPO:6.0.401-jammy-arm64v8 AS installer FROM $SDK_REPO:6.0.401-jammy-arm64v8 AS installer
# Install .NET Monitor # Install .NET Monitor
ENV DOTNET_MONITOR_VERSION=6.2.2 ENV DOTNET_MONITOR_VERSION=6.3.0-alpha.1.22472.4
RUN curl -fSL --output dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/6.2.2-servicing.22401.2/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \ RUN curl -fSL --output dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$DOTNET_MONITOR_VERSION/dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg \
&& dotnetmonitor_sha512='5d5df17e81ed66e644dc7323e89caee10f7eadbf62a28e0443e9fe12df1c5283fce2ebf6bc4dc2e5004c3c9e044101fc131ff293f382f15a32c91a6e159619d7' \ && dotnetmonitor_sha512='74845a2ff5d9aa4750c3a8433d1fa7078954c94d459221528187bfd43dfeca2101b055311b9bbbb9b135a063e367a9b1048e9150d1dc14320049d441b9e556e0' \
&& echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \ && echo "$dotnetmonitor_sha512 dotnet-monitor.$DOTNET_MONITOR_VERSION.nupkg" | sha512sum -c - \
&& dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \ && dotnet tool install dotnet-monitor --tool-path /app --add-source / --version $DOTNET_MONITOR_VERSION --framework net6.0 --no-cache \
# To reduce image size, remove all non-net6.0 TFMs # To reduce image size, remove all non-net6.0 TFMs

1
tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
Просмотреть файл

@ -11,6 +11,7 @@ namespace Microsoft.DotNet.Docker.Tests
public static readonly Version V3_1 = new Version(3, 1); public static readonly Version V3_1 = new Version(3, 1);
public static readonly Version V6_0 = new Version(6, 0); public static readonly Version V6_0 = new Version(6, 0);
public static readonly Version V6_2 = new Version(6, 2); public static readonly Version V6_2 = new Version(6, 2);
public static readonly Version V6_3 = new Version(6, 3);
public static readonly Version V7_0 = new Version(7, 0); public static readonly Version V7_0 = new Version(7, 0);
} }
} }

10
tests/Microsoft.DotNet.Docker.Tests/TestData.cs
Просмотреть файл

@ -119,12 +119,18 @@ namespace Microsoft.DotNet.Docker.Tests
{ {
new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Amd64 }, new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Arm64 }, new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Arm64 },
new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.JammyChiseled, OSTag = OS.UbuntuChiseled, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.JammyChiseled, OSTag = OS.UbuntuChiseled, Arch = Arch.Arm64 },
new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Amd64 }, new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Arm64 }, new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Arm64 },
new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Amd64 }, new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Arm64 }, new MonitorImageData { Version = V6_2, RuntimeVersion = V6_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Arm64 },
new MonitorImageData { Version = V6_3, RuntimeVersion = V6_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_3, RuntimeVersion = V6_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Arm64 },
new MonitorImageData { Version = V6_3, RuntimeVersion = V6_0, OS = OS.JammyChiseled, OSTag = OS.UbuntuChiseled, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_3, RuntimeVersion = V6_0, OS = OS.JammyChiseled, OSTag = OS.UbuntuChiseled, Arch = Arch.Arm64 },
new MonitorImageData { Version = V6_3, RuntimeVersion = V6_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_3, RuntimeVersion = V6_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Arm64 },
new MonitorImageData { Version = V6_3, RuntimeVersion = V6_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Amd64 },
new MonitorImageData { Version = V6_3, RuntimeVersion = V6_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Arm64 },
new MonitorImageData { Version = V7_0, RuntimeVersion = V7_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Amd64 }, new MonitorImageData { Version = V7_0, RuntimeVersion = V7_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Amd64 },
new MonitorImageData { Version = V7_0, RuntimeVersion = V7_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Arm64 }, new MonitorImageData { Version = V7_0, RuntimeVersion = V7_0, OS = OS.Alpine316, OSTag = OS.Alpine, Arch = Arch.Arm64 },
new MonitorImageData { Version = V7_0, RuntimeVersion = V7_0, OS = OS.JammyChiseled, OSTag = OS.UbuntuChiseled, Arch = Arch.Amd64 }, new MonitorImageData { Version = V7_0, RuntimeVersion = V7_0, OS = OS.JammyChiseled, OSTag = OS.UbuntuChiseled, Arch = Arch.Amd64 },

10
tests/performance/ImageSize.nightly.linux.json
Просмотреть файл

@ -181,12 +181,18 @@
"dotnet/nightly/monitor": { "dotnet/nightly/monitor": {
"src/monitor/6.2/alpine/amd64": 108549128, "src/monitor/6.2/alpine/amd64": 108549128,
"src/monitor/6.2/alpine/arm64v8": 119150710, "src/monitor/6.2/alpine/arm64v8": 119150710,
"src/monitor/6.2/ubuntu-chiseled/amd64": 115164495,
"src/monitor/6.2/ubuntu-chiseled/arm64v8": 122077072,
"src/monitor/6.2/cbl-mariner/amd64": 220058031, "src/monitor/6.2/cbl-mariner/amd64": 220058031,
"src/monitor/6.2/cbl-mariner/arm64v8": 217457652, "src/monitor/6.2/cbl-mariner/arm64v8": 217457652,
"src/monitor/6.2/cbl-mariner-distroless/amd64": 125187590, "src/monitor/6.2/cbl-mariner-distroless/amd64": 125187590,
"src/monitor/6.2/cbl-mariner-distroless/arm64v8": 131783453, "src/monitor/6.2/cbl-mariner-distroless/arm64v8": 131783453,
"src/monitor/6.3/alpine/amd64": 108549128,
"src/monitor/6.3/alpine/arm64v8": 119150710,
"src/monitor/6.3/ubuntu-chiseled/amd64": 115164495,
"src/monitor/6.3/ubuntu-chiseled/arm64v8": 122077072,
"src/monitor/6.3/cbl-mariner/amd64": 220058031,
"src/monitor/6.3/cbl-mariner/arm64v8": 217457652,
"src/monitor/6.3/cbl-mariner-distroless/amd64": 125187590,
"src/monitor/6.3/cbl-mariner-distroless/arm64v8": 131783453,
"src/monitor/7.0/alpine/amd64": 109210745, "src/monitor/7.0/alpine/amd64": 109210745,
"src/monitor/7.0/alpine/arm64v8": 119985095, "src/monitor/7.0/alpine/arm64v8": 119985095,
"src/monitor/7.0/ubuntu-chiseled/amd64": 118580459, "src/monitor/7.0/ubuntu-chiseled/amd64": 118580459,