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

.NET Monitor 7.3 images (#4786)

This commit is contained in:
Justin Anderson 2023-08-01 08:40:03 -07:00 коммит произвёл Logan Bussell
Родитель 29b767aaa4
Коммит d043450321
13 изменённых файлов: 466 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -46,7 +46,8 @@ See the [documentation](https://go.microsoft.com/fwlink/?linkid=2158052) for how
## Linux amd64 Tags
Tags | Dockerfile | OS Version
-----------| -------------| -------------
7.2.1-alpine-amd64, 7.2-alpine-amd64, 7-alpine-amd64, 7.2.1-alpine, 7.2-alpine, 7-alpine, 7.2.1, 7.2, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.2/alpine/amd64/Dockerfile) | Alpine 3.18
7.3.0-alpine-amd64, 7.3-alpine-amd64, 7-alpine-amd64, 7.3.0-alpine, 7.3-alpine, 7-alpine, 7.3.0, 7.3, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.3/alpine/amd64/Dockerfile) | Alpine 3.18
7.2.1-alpine-amd64, 7.2-alpine-amd64, 7.2.1-alpine, 7.2-alpine, 7.2.1, 7.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.2/alpine/amd64/Dockerfile) | Alpine 3.18
7.1.2-alpine-amd64, 7.1-alpine-amd64, 7.1.2-alpine, 7.1-alpine, 7.1.2, 7.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.1/alpine/amd64/Dockerfile) | Alpine 3.18
6.3.2-alpine-amd64, 6.3-alpine-amd64, 6-alpine-amd64, 6.3.2-alpine, 6.3-alpine, 6-alpine, 6.3.2, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/amd64/Dockerfile) | Alpine 3.18
@ -58,7 +59,8 @@ Tags | Dockerfile | OS Version
## Linux arm64 Tags
Tags | Dockerfile | OS Version
-----------| -------------| -------------
7.2.1-alpine-arm64v8, 7.2-alpine-arm64v8, 7-alpine-arm64v8, 7.2.1-alpine, 7.2-alpine, 7-alpine, 7.2.1, 7.2, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.2/alpine/arm64v8/Dockerfile) | Alpine 3.18
7.3.0-alpine-arm64v8, 7.3-alpine-arm64v8, 7-alpine-arm64v8, 7.3.0-alpine, 7.3-alpine, 7-alpine, 7.3.0, 7.3, 7, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.3/alpine/arm64v8/Dockerfile) | Alpine 3.18
7.2.1-alpine-arm64v8, 7.2-alpine-arm64v8, 7.2.1-alpine, 7.2-alpine, 7.2.1, 7.2 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.2/alpine/arm64v8/Dockerfile) | Alpine 3.18
7.1.2-alpine-arm64v8, 7.1-alpine-arm64v8, 7.1.2-alpine, 7.1-alpine, 7.1.2, 7.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/7.1/alpine/arm64v8/Dockerfile) | Alpine 3.18
6.3.2-alpine-arm64v8, 6.3-alpine-arm64v8, 6-alpine-arm64v8, 6.3.2-alpine, 6.3-alpine, 6-alpine, 6.3.2, 6.3, 6 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/monitor/6.3/alpine/arm64v8/Dockerfile) | Alpine 3.18

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

@ -3,6 +3,8 @@ $(McrTagsYmlTagGroup:8.0-preview-ubuntu-chiseled-amd64)
customSubTableTitle: .NET Monitor 8 Preview Tags
$(McrTagsYmlTagGroup:8.0-preview-ubuntu-chiseled-arm64v8)
customSubTableTitle: .NET Monitor 8 Preview Tags
$(McrTagsYmlTagGroup:7.3-alpine-amd64)
$(McrTagsYmlTagGroup:7.3-alpine-arm64v8)
$(McrTagsYmlTagGroup:7.2-alpine-amd64)
$(McrTagsYmlTagGroup:7.2-alpine-arm64v8)
$(McrTagsYmlTagGroup:7.1-alpine-amd64)

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

@ -6296,11 +6296,8 @@
"sharedTags": {
"$(monitor|7.2|product-version)-alpine": {},
"7.2-alpine": {},
"7-alpine": {},
"$(monitor|7.2|product-version)": {},
"7.2": {},
"7": {},
"latest": {}
"7.2": {}
},
"platforms": [
{
@ -6313,8 +6310,7 @@
"osVersion": "alpine3.18",
"tags": {
"$(monitor|7.2|product-version)-alpine-amd64": {},
"7.2-alpine-amd64": {},
"7-alpine-amd64": {}
"7.2-alpine-amd64": {}
}
},
{
@ -6328,8 +6324,7 @@
"osVersion": "alpine3.18",
"tags": {
"$(monitor|7.2|product-version)-alpine-arm64v8": {},
"7.2-alpine-arm64v8": {},
"7-alpine-arm64v8": {}
"7.2-alpine-arm64v8": {}
},
"variant": "v8"
}
@ -6343,9 +6338,6 @@
},
"7.2-cbl-mariner": {
"docType": "Undocumented"
},
"7-cbl-mariner": {
"docType": "Undocumented"
}
},
"platforms": [
@ -6363,9 +6355,6 @@
},
"7.2-cbl-mariner-amd64": {
"docType": "Undocumented"
},
"7-cbl-mariner-amd64": {
"docType": "Undocumented"
}
}
},
@ -6384,9 +6373,6 @@
},
"7.2-cbl-mariner-arm64v8": {
"docType": "Undocumented"
},
"7-cbl-mariner-arm64v8": {
"docType": "Undocumented"
}
},
"variant": "v8"
@ -6401,9 +6387,6 @@
},
"7.2-cbl-mariner-distroless": {
"docType": "Undocumented"
},
"7-cbl-mariner-distroless": {
"docType": "Undocumented"
}
},
"platforms": [
@ -6421,9 +6404,6 @@
},
"7.2-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
},
"7-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
}
}
},
@ -6442,6 +6422,163 @@
},
"7.2-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented"
}
},
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|7.3|product-version)",
"sharedTags": {
"$(monitor|7.3|product-version)-alpine": {},
"7.3-alpine": {},
"7-alpine": {},
"$(monitor|7.3|product-version)": {},
"7.3": {},
"7": {},
"latest": {}
},
"platforms": [
{
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/monitor/7.3/alpine/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
"os": "linux",
"osVersion": "alpine3.18",
"tags": {
"$(monitor|7.3|product-version)-alpine-amd64": {},
"7.3-alpine-amd64": {},
"7-alpine-amd64": {}
}
},
{
"architecture": "arm64",
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/monitor/7.3/alpine/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
"os": "linux",
"osVersion": "alpine3.18",
"tags": {
"$(monitor|7.3|product-version)-alpine-arm64v8": {},
"7.3-alpine-arm64v8": {},
"7-alpine-arm64v8": {}
},
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|7.3|product-version)",
"sharedTags": {
"$(monitor|7.3|product-version)-cbl-mariner": {
"docType": "Undocumented"
},
"7.3-cbl-mariner": {
"docType": "Undocumented"
},
"7-cbl-mariner": {
"docType": "Undocumented"
}
},
"platforms": [
{
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/monitor/7.3/cbl-mariner/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
"os": "linux",
"osVersion": "cbl-mariner2.0",
"tags": {
"$(monitor|7.3|product-version)-cbl-mariner-amd64": {
"docType": "Undocumented"
},
"7.3-cbl-mariner-amd64": {
"docType": "Undocumented"
},
"7-cbl-mariner-amd64": {
"docType": "Undocumented"
}
}
},
{
"architecture": "arm64",
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/monitor/7.3/cbl-mariner/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
"os": "linux",
"osVersion": "cbl-mariner2.0",
"tags": {
"$(monitor|7.3|product-version)-cbl-mariner-arm64v8": {
"docType": "Undocumented"
},
"7.3-cbl-mariner-arm64v8": {
"docType": "Undocumented"
},
"7-cbl-mariner-arm64v8": {
"docType": "Undocumented"
}
},
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|7.3|product-version)",
"sharedTags": {
"$(monitor|7.3|product-version)-cbl-mariner-distroless": {
"docType": "Undocumented"
},
"7.3-cbl-mariner-distroless": {
"docType": "Undocumented"
},
"7-cbl-mariner-distroless": {
"docType": "Undocumented"
}
},
"platforms": [
{
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/monitor/7.3/cbl-mariner-distroless/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
"os": "linux",
"osVersion": "cbl-mariner2.0-distroless",
"tags": {
"$(monitor|7.3|product-version)-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
},
"7.3-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
},
"7-cbl-mariner-distroless-amd64": {
"docType": "Undocumented"
}
}
},
{
"architecture": "arm64",
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/monitor/7.3/cbl-mariner-distroless/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
"os": "linux",
"osVersion": "cbl-mariner2.0-distroless",
"tags": {
"$(monitor|7.3|product-version)-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented"
},
"7.3-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented"
},
"7-cbl-mariner-distroless-arm64v8": {
"docType": "Undocumented"

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

@ -60,6 +60,8 @@
"base-url|7.1-monitor|nightly": "$(base-url|public|nightly)",
"base-url|7.2-monitor|main": "$(base-url|public|main)",
"base-url|7.2-monitor|nightly": "$(base-url|public|nightly)",
"base-url|7.3-monitor|main": "$(base-url|public|main)",
"base-url|7.3-monitor|nightly": "$(base-url|public|nightly)",
"base-url|8.0-monitor|main": "$(base-url|public|main)",
"base-url|8.0-monitor|nightly": "$(base-url|public|nightly)",
@ -112,6 +114,13 @@
"monitor|7.2|linux|arm64|sha": "d82d40d2125d4ddab7d212e45adf20a095f4862e1c3cfbf047fe49ea394d9b895a51a5d71211dc0f36fc6c071de5d0e93f7c96cc9e8c2ea9473d70cf15cccf7e",
"monitor|7.2|product-version": "7.2.1",
"monitor|7.3|build-version": "7.3.0-rtm.23376.3",
"monitor|7.3|linux-musl|x64|sha": "a2e122a34ab3c77203dde8ab79e53f6d8da95d2c4bac3d77b432ea44b2a2fd3262a0e633e8a6913eee7f4fa13647280b4f00f26a4243e7e1bd0617372b242f1d",
"monitor|7.3|linux-musl|arm64|sha": "a00de343e2da79c7bf769a9db8743bfa895c67659c892fd73340162ce1667eac54a3838c3476e5248865ae34351cd90981809bd5876f00954802be7f8a556b35",
"monitor|7.3|linux|x64|sha": "f157f5812e0200742adb32d70b10ed880bee69dd1e08104d7f498fb436e96ac44fee6be0b058f8d0774a0ccd7702463dd7ca9c14b79ab9b0280f56d13f97fec1",
"monitor|7.3|linux|arm64|sha": "371bee3f206c8835c0a1ce48b8ccb559d512eff22b10c6ace49aa649b3ef8e13b262368c506d7d2c7ae341eeb70049ff01ed09f87db098911eeb4fbfecbf8164",
"monitor|7.3|product-version": "7.3.0",
"monitor|8.0|build-version": "8.0.0-preview.6.23354.3",
"monitor|8.0|product-version": "8.0.0-preview.6",

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

@ -0,0 +1,37 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet
FROM $REPO:7.0.9-alpine3.18-amd64
WORKDIR /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 \
# Server GC mode
DOTNET_gcServer=1 \
# 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}"
# Install .NET Monitor
RUN dotnet_monitor_version=7.3.0 \
&& wget -O dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/7.3.0-rtm.23376.3/dotnet-monitor-$dotnet_monitor_version-linux-musl-x64.tar.gz \
&& dotnet_monitor_sha512='a2e122a34ab3c77203dde8ab79e53f6d8da95d2c4bac3d77b432ea44b2a2fd3262a0e633e8a6913eee7f4fa13647280b4f00f26a4243e7e1bd0617372b242f1d' \
&& echo "$dotnet_monitor_sha512 dotnet-monitor.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor.tar.gz -C /app \
&& rm dotnet-monitor.tar.gz
ENTRYPOINT [ "dotnet-monitor" ]
CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

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

@ -0,0 +1,37 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet
FROM $REPO:7.0.9-alpine3.18-arm64v8
WORKDIR /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 \
# Server GC mode
DOTNET_gcServer=1 \
# 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}"
# Install .NET Monitor
RUN dotnet_monitor_version=7.3.0 \
&& wget -O dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/7.3.0-rtm.23376.3/dotnet-monitor-$dotnet_monitor_version-linux-musl-arm64.tar.gz \
&& dotnet_monitor_sha512='a00de343e2da79c7bf769a9db8743bfa895c67659c892fd73340162ce1667eac54a3838c3476e5248865ae34351cd90981809bd5876f00954802be7f8a556b35' \
&& echo "$dotnet_monitor_sha512 dotnet-monitor.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor.tar.gz -C /app \
&& rm dotnet-monitor.tar.gz
ENTRYPOINT [ "dotnet-monitor" ]
CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

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

@ -0,0 +1,51 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet
# Installer image
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer
RUN tdnf install -y \
ca-certificates \
gzip \
tar \
&& tdnf clean all
# Retrieve .NET Monitor
RUN dotnet_monitor_version=7.3.0 \
&& curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/7.3.0-rtm.23376.3/dotnet-monitor-$dotnet_monitor_version-linux-x64.tar.gz \
&& dotnet_monitor_sha512='f157f5812e0200742adb32d70b10ed880bee69dd1e08104d7f498fb436e96ac44fee6be0b058f8d0774a0ccd7702463dd7ca9c14b79ab9b0280f56d13f97fec1' \
&& echo "$dotnet_monitor_sha512 dotnet-monitor.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor.tar.gz -C /app \
&& rm dotnet-monitor.tar.gz
# .NET Monitor image
FROM $REPO:7.0.9-cbl-mariner2.0-distroless-amd64
COPY --from=installer ["/app", "/app"]
WORKDIR /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 \
# Server GC mode
DOTNET_gcServer=1 \
# 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" ]
CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

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

@ -0,0 +1,51 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet
# Installer image
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer
RUN tdnf install -y \
ca-certificates \
gzip \
tar \
&& tdnf clean all
# Retrieve .NET Monitor
RUN dotnet_monitor_version=7.3.0 \
&& curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/7.3.0-rtm.23376.3/dotnet-monitor-$dotnet_monitor_version-linux-arm64.tar.gz \
&& dotnet_monitor_sha512='371bee3f206c8835c0a1ce48b8ccb559d512eff22b10c6ace49aa649b3ef8e13b262368c506d7d2c7ae341eeb70049ff01ed09f87db098911eeb4fbfecbf8164' \
&& echo "$dotnet_monitor_sha512 dotnet-monitor.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor.tar.gz -C /app \
&& rm dotnet-monitor.tar.gz
# .NET Monitor image
FROM $REPO:7.0.9-cbl-mariner2.0-distroless-arm64v8
COPY --from=installer ["/app", "/app"]
WORKDIR /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 \
# Server GC mode
DOTNET_gcServer=1 \
# 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" ]
CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

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

@ -0,0 +1,51 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet
# Installer image
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer
RUN tdnf install -y \
ca-certificates \
gzip \
tar \
&& tdnf clean all
# Retrieve .NET Monitor
RUN dotnet_monitor_version=7.3.0 \
&& curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/7.3.0-rtm.23376.3/dotnet-monitor-$dotnet_monitor_version-linux-x64.tar.gz \
&& dotnet_monitor_sha512='f157f5812e0200742adb32d70b10ed880bee69dd1e08104d7f498fb436e96ac44fee6be0b058f8d0774a0ccd7702463dd7ca9c14b79ab9b0280f56d13f97fec1' \
&& echo "$dotnet_monitor_sha512 dotnet-monitor.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor.tar.gz -C /app \
&& rm dotnet-monitor.tar.gz
# .NET Monitor image
FROM $REPO:7.0.9-cbl-mariner2.0-amd64
COPY --from=installer ["/app", "/app"]
WORKDIR /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 \
# Server GC mode
DOTNET_gcServer=1 \
# 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" ]
CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

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

@ -0,0 +1,51 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet
# Installer image
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer
RUN tdnf install -y \
ca-certificates \
gzip \
tar \
&& tdnf clean all
# Retrieve .NET Monitor
RUN dotnet_monitor_version=7.3.0 \
&& curl -fSL --output dotnet-monitor.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/7.3.0-rtm.23376.3/dotnet-monitor-$dotnet_monitor_version-linux-arm64.tar.gz \
&& dotnet_monitor_sha512='371bee3f206c8835c0a1ce48b8ccb559d512eff22b10c6ace49aa649b3ef8e13b262368c506d7d2c7ae341eeb70049ff01ed09f87db098911eeb4fbfecbf8164' \
&& echo "$dotnet_monitor_sha512 dotnet-monitor.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor.tar.gz -C /app \
&& rm dotnet-monitor.tar.gz
# .NET Monitor image
FROM $REPO:7.0.9-cbl-mariner2.0-arm64v8
COPY --from=installer ["/app", "/app"]
WORKDIR /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 \
# Server GC mode
DOTNET_gcServer=1 \
# 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" ]
CMD [ "collect", "--urls", "https://+:52323", "--metricUrls", "http://+:52325" ]

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

@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Docker.Tests
public static readonly ImageVersion V7_0 = new(new Version(7, 0), isPreview: false);
public static readonly ImageVersion V7_1 = new(new Version(7, 1), isPreview: false);
public static readonly ImageVersion V7_2 = new(new Version(7, 2), isPreview: false);
public static readonly ImageVersion V7_3 = new(new Version(7, 3), isPreview: false);
public static readonly ImageVersion V8_0 = new(new Version(8, 0), isPreview: true);
public ImageVersion(Version version, bool isPreview)

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

@ -157,6 +157,12 @@ namespace Microsoft.DotNet.Docker.Tests
new ProductImageData { Version = V7_2, VersionFamily = V7_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Arm64 },
new ProductImageData { Version = V7_2, VersionFamily = V7_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Amd64 },
new ProductImageData { Version = V7_2, VersionFamily = V7_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Arm64 },
new ProductImageData { Version = V7_3, VersionFamily = V7_0, OS = OS.Alpine318, OSTag = OS.Alpine, Arch = Arch.Amd64 },
new ProductImageData { Version = V7_3, VersionFamily = V7_0, OS = OS.Alpine318, OSTag = OS.Alpine, Arch = Arch.Arm64 },
new ProductImageData { Version = V7_3, VersionFamily = V7_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Amd64 },
new ProductImageData { Version = V7_3, VersionFamily = V7_0, OS = OS.Mariner20, OSTag = OS.Mariner, Arch = Arch.Arm64 },
new ProductImageData { Version = V7_3, VersionFamily = V7_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Amd64 },
new ProductImageData { Version = V7_3, VersionFamily = V7_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Arm64 },
new ProductImageData { Version = V8_0, VersionFamily = V8_0, OS = OS.JammyChiseled, OSTag = OS.UbuntuChiseled, Arch = Arch.Amd64 },
new ProductImageData { Version = V8_0, VersionFamily = V8_0, OS = OS.JammyChiseled, OSTag = OS.UbuntuChiseled, Arch = Arch.Arm64 },
new ProductImageData { Version = V8_0, VersionFamily = V8_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Amd64 },

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

@ -266,6 +266,12 @@
"src/monitor/7.2/cbl-mariner/arm64v8": 223436409,
"src/monitor/7.2/cbl-mariner-distroless/amd64": 137925163,
"src/monitor/7.2/cbl-mariner-distroless/arm64v8": 145441793,
"src/monitor/7.3/alpine/amd64": 128250369,
"src/monitor/7.3/alpine/arm64v8": 141137686,
"src/monitor/7.3/cbl-mariner/amd64": 219210220,
"src/monitor/7.3/cbl-mariner/arm64v8": 224001932,
"src/monitor/7.3/cbl-mariner-distroless/amd64": 138412478,
"src/monitor/7.3/cbl-mariner-distroless/arm64v8": 145932798,
"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,