Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial .NET Monitor 9.1 Preview Images #6230

Open
wants to merge 7 commits into
base: nightly
Choose a base branch
from
Open

Initial .NET Monitor 9.1 Preview Images #6230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fbd3f6f
.NET Monitor 9.1 Preview
jander-msft Feb 10, 2025
224482e
Add Dockerfile baselines
jander-msft Feb 12, 2025
ec8c335
Set 9.1 as preview version in tests
jander-msft Feb 12, 2025
25c8da3
Merge branch 'nightly' of https://github.com/dotnet/dotnet-docker int…
jander-msft Feb 18, 2025
bc81a6c
Move latest to 9.1 and add 9-preview tags
jander-msft Feb 19, 2025
ae19678
Merge branch 'nightly' into monitor-9.1
jander-msft Feb 19, 2025
f559c68
Merge branch 'nightly' into monitor-9.1
lbussell Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions README.monitor-base.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ Tags | Dockerfile | OS Version
8.0.8-ubuntu-chiseled-amd64, 8.0-ubuntu-chiseled-amd64, 8.0.8-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.8, 8.0 | [Dockerfile](src/monitor-base/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.8-cbl-mariner-distroless-amd64, 8.0-cbl-mariner-distroless-amd64, 8.0.8-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor-base/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0

#### .NET Monitor Preview Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-alpha.1-amd64, 9.1-preview-amd64, 9.1.0-alpha.1, 9.1-preview | [Dockerfile](src/monitor-base/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0

### Linux arm64 Tags

Tags | Dockerfile | OS Version
Expand All @@ -69,6 +75,12 @@ Tags | Dockerfile | OS Version
8.1.0-cbl-mariner-distroless-arm64v8, 8.1-cbl-mariner-distroless-arm64v8, 8-cbl-mariner-distroless-arm64v8, 8.1.0-cbl-mariner-distroless, 8.1-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](src/monitor-base/8.1/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
8.0.8-ubuntu-chiseled-arm64v8, 8.0-ubuntu-chiseled-arm64v8, 8.0.8-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.8, 8.0 | [Dockerfile](src/monitor-base/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.8-cbl-mariner-distroless-arm64v8, 8.0-cbl-mariner-distroless-arm64v8, 8.0.8-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor-base/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0

#### .NET Monitor Preview Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-alpha.1-arm64v8, 9.1-preview-arm64v8, 9.1.0-alpha.1, 9.1-preview | [Dockerfile](src/monitor-base/9.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.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/nightly/monitor/base/tags/list) for all supported and unsupported tags.*
Expand Down
12 changes: 12 additions & 0 deletions README.monitor.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ Tags | Dockerfile | OS Version
8.0.8-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.8, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/amd64/Dockerfile) | Ubuntu 22.04
8.0.8-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0

#### .NET Monitor Preview Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-alpha.1, 9.1-preview | [Dockerfile](src/monitor/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0

### Linux arm64 Tags

Tags | Dockerfile | OS Version
Expand All @@ -68,6 +74,12 @@ Tags | Dockerfile | OS Version
8.1.0-cbl-mariner-distroless-arm64v8, 8.1-cbl-mariner-distroless-arm64v8, 8-cbl-mariner-distroless-arm64v8, 8.1.0-cbl-mariner-distroless, 8.1-cbl-mariner-distroless, 8-cbl-mariner-distroless | [Dockerfile](src/monitor/8.1/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
8.0.8-ubuntu-chiseled, 8.0-ubuntu-chiseled, 8.0.8, 8.0 | [Dockerfile](src/monitor/8.0/ubuntu-chiseled/arm64v8/Dockerfile) | Ubuntu 22.04
8.0.8-cbl-mariner-distroless, 8.0-cbl-mariner-distroless | [Dockerfile](src/monitor/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0

#### .NET Monitor Preview Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-alpha.1, 9.1-preview | [Dockerfile](src/monitor/9.1/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.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/nightly/monitor/tags/list) for all supported and unsupported tags.*
Expand Down
1 change: 1 addition & 0 deletions eng/mcr-tags-metadata-templates/monitor-base-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$(McrTagsYmlRepo:monitor-base)
$(McrTagsYmlTagGroup:9.1-preview|.NET Monitor Preview Tags)
$(McrTagsYmlTagGroup:9.0)
$(McrTagsYmlTagGroup:8.1-ubuntu-chiseled)
$(McrTagsYmlTagGroup:8.1-cbl-mariner-distroless)
Expand Down
1 change: 1 addition & 0 deletions eng/mcr-tags-metadata-templates/monitor-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
$(McrTagsYmlRepo:monitor)
$(McrTagsYmlTagGroup:9.1-preview|.NET Monitor Preview Tags)
$(McrTagsYmlTagGroup:9.0)
$(McrTagsYmlTagGroup:8.1-ubuntu-chiseled)
$(McrTagsYmlTagGroup:8.1-cbl-mariner-distroless)
Expand Down
82 changes: 82 additions & 0 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10161,6 +10161,43 @@
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|9.1|product-version)",
"sharedTags": {
"$(monitor|9.1|fixed-tag)": {},
"$(monitor|9.1|minor-tag)": {}
},
"platforms": [
{
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/monitor-base/9.1/azurelinux-distroless/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux",
"os": "linux",
"osVersion": "azurelinux3.0-distroless",
"tags": {
"$(monitor|9.1|fixed-tag)-amd64": {},
"$(monitor|9.1|minor-tag)-amd64": {}
}
},
{
"architecture": "arm64",
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/monitor-base/9.1/azurelinux-distroless/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor-base/Dockerfile.linux",
"os": "linux",
"osVersion": "azurelinux3.0-distroless",
"tags": {
"$(monitor|9.1|fixed-tag)-arm64v8": {},
"$(monitor|9.1|minor-tag)-arm64v8": {}
},
"variant": "v8"
}
]
}
]
},
Expand Down Expand Up @@ -10404,6 +10441,51 @@
"variant": "v8"
}
]
},
{
"productVersion": "$(monitor|9.1|product-version)",
"sharedTags": {
"$(monitor|9.1|fixed-tag)": {},
"$(monitor|9.1|minor-tag)": {}
},
"platforms": [
{
"buildArgs": {
"REPO": "$(Repo:monitor-base)"
},
"dockerfile": "src/monitor/9.1/azurelinux-distroless/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
"os": "linux",
"osVersion": "azurelinux3.0-distroless",
"tags": {
"$(monitor|9.1|fixed-tag)-amd64": {
"docType": "Undocumented"
},
"$(monitor|9.1|minor-tag)-amd64": {
"docType": "Undocumented"
}
}
},
{
"architecture": "arm64",
"buildArgs": {
"REPO": "$(Repo:monitor-base)"
},
"dockerfile": "src/monitor/9.1/azurelinux-distroless/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/monitor/Dockerfile.linux",
"os": "linux",
"osVersion": "azurelinux3.0-distroless",
"tags": {
"$(monitor|9.1|fixed-tag)-arm64v8": {
"docType": "Undocumented"
},
"$(monitor|9.1|minor-tag)-arm64v8": {
"docType": "Undocumented"
}
},
"variant": "v8"
}
]
}
]
},
Expand Down
13 changes: 13 additions & 0 deletions manifest.versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,19 @@
"monitor-ext-s3storage|9.0|linux|x64|sha": "4dfc3b612b4b8389216e232144b61ff82a1e1da9a7414b2d21bf083ad38a980569f69c605919deeac8af05188254fcfc7651d3606845405d45af2d0f5a96b5bd",
"monitor-ext-s3storage|9.0|linux|arm64|sha": "06d9c1997b298c68132f5536a7b517e6c8422b9d09e75a90603b6c18abd7f851625ba8b162a761f6575fcb06b47e4ac11e55e7d494f744e1594638c7dcbb474c",

"monitor|9.1|build-version": "9.1.0-alpha.1.25104.5",
"monitor|9.1|product-version": "9.1.0-alpha.1",
"monitor|9.1|fixed-tag": "$(monitor|9.1|product-version)",
"monitor|9.1|minor-tag": "9.1-preview",
"monitor|9.1|base-url|main": "$(base-url|public|maintenance|main)",
"monitor|9.1|base-url|nightly": "$(base-url|public|preview|nightly)",
"monitor-base|9.1|linux|x64|sha": "4ed01d2be34f2e77abb00b7f5f17bef052827e112b950f358f91b7074e8ae8e3bf44996751e9b80c98b5feee2a2f5e306b0d806f79c0793405ef5d9ca56c1420",
"monitor-base|9.1|linux|arm64|sha": "a728f1197f90152b73dd0bab7eab546429082c78f42b72c041fa8b2df8847d81057804bf92cb53d9897cf0d83bb2e8d147119e20f9878e3ea27ed31ec8b82e5c",
"monitor-ext-azureblobstorage|9.1|linux|x64|sha": "420545a416f91b860687900d19026fc748f6ea10531786cf2e70dabf6940049584eba18a0341f8577a52d5b6fb942b60181c4bd5220f02a975826375f8392bf2",
"monitor-ext-azureblobstorage|9.1|linux|arm64|sha": "e03781f946d624890e0be426d15f638e9c6624dbb4b53b0a0cfd6d3334a82921e3ec148f313556368e6956d7dbe296e284c2b1a1dff4dae105827fe55ebfca6d",
"monitor-ext-s3storage|9.1|linux|x64|sha": "bae0be76bd175c1719e0226c6f77f63f392cbbf8312732b8170f84f577cbb75137973c3ed4e9b0cdbd87816e8d6b4dae2643a918680e99acbeefab61a3d60c1e",
"monitor-ext-s3storage|9.1|linux|arm64|sha": "1f63bed827cbe1dcd508bfaf8ccab40e7d0338450cc9bf0829cc2d1e5c6fe90b1de6fb687aba356071d50794c858ec1a1330990c11e91fe64a2db48c305cbfc6",

"powershell|8.0|build-version": "7.4.7",
"powershell|8.0|Linux.Alpine|sha": "9c5fbb87edf9f1b3da05beeeacd69ae361cb60b0eb16079c26a5c6b477a17e4ed1deef31cdb23de43c959eae2a2731cf16188b491db2ad5d398276ca0e71faaf",
"powershell|8.0|Linux|arm32|sha": "727c67c3d29e3f3216366b5e2487b14baf926ab36da58833aecb84d663e4a6f61d2c073d7a99f7b05294cea71f3d37c90bbd237cd4cad6491dd8031544c16841",
Expand Down
50 changes: 50 additions & 0 deletions src/monitor-base/9.1/azurelinux-distroless/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet

# Installer image
FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer

RUN tdnf install -y \
ca-certificates \
gzip \
tar \
&& tdnf clean all

# Retrieve .NET Monitor Base
RUN dotnet_monitor_version=9.1.0-alpha.1.25104.5 \
&& curl -fSL --output dotnet-monitor-base.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
&& dotnet_monitor_base_sha512='4ed01d2be34f2e77abb00b7f5f17bef052827e112b950f358f91b7074e8ae8e3bf44996751e9b80c98b5feee2a2f5e306b0d806f79c0793405ef5d9ca56c1420' \
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-base.tar.gz -C /app \
&& rm dotnet-monitor-base.tar.gz


# .NET Monitor Base image
FROM $REPO:9.0.2-azurelinux3.0-distroless-amd64

WORKDIR /app
COPY --from=installer /app .

ENV \
# Unset ASPNETCORE_HTTP_PORTS from aspnet base image
ASPNETCORE_HTTP_PORTS= \
# 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" ]
50 changes: 50 additions & 0 deletions src/monitor-base/9.1/azurelinux-distroless/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet

# Installer image
FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer

RUN tdnf install -y \
ca-certificates \
gzip \
tar \
&& tdnf clean all

# Retrieve .NET Monitor Base
RUN dotnet_monitor_version=9.1.0-alpha.1.25104.5 \
&& curl -fSL --output dotnet-monitor-base.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
&& dotnet_monitor_base_sha512='a728f1197f90152b73dd0bab7eab546429082c78f42b72c041fa8b2df8847d81057804bf92cb53d9897cf0d83bb2e8d147119e20f9878e3ea27ed31ec8b82e5c' \
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-base.tar.gz -C /app \
&& rm dotnet-monitor-base.tar.gz


# .NET Monitor Base image
FROM $REPO:9.0.2-azurelinux3.0-distroless-arm64v8

WORKDIR /app
COPY --from=installer /app .

ENV \
# Unset ASPNETCORE_HTTP_PORTS from aspnet base image
ASPNETCORE_HTTP_PORTS= \
# 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" ]
32 changes: 32 additions & 0 deletions src/monitor/9.1/azurelinux-distroless/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
ARG REPO=mcr.microsoft.com/dotnet/monitor/base

# Installer image
FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer

RUN tdnf install -y \
ca-certificates \
gzip \
tar \
&& tdnf clean all

# Retrieve .NET Monitor extensions
RUN dotnet_monitor_extension_version=9.1.0-alpha.1.25104.5 \
&& curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
&& dotnet_monitor_extension_sha512='420545a416f91b860687900d19026fc748f6ea10531786cf2e70dabf6940049584eba18a0341f8577a52d5b6fb942b60181c4bd5220f02a975826375f8392bf2' \
&& echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
\
&& curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
&& dotnet_monitor_extension_sha512='bae0be76bd175c1719e0226c6f77f63f392cbbf8312732b8170f84f577cbb75137973c3ed4e9b0cdbd87816e8d6b4dae2643a918680e99acbeefab61a3d60c1e' \
&& echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
\
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
&& rm dotnet-monitor-egress-azureblobstorage.tar.gz \
&& tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
&& rm dotnet-monitor-egress-s3storage.tar.gz


# .NET Monitor image
FROM $REPO:9.1.0-alpha.1-amd64

COPY --from=installer ["/app", "/app"]
32 changes: 32 additions & 0 deletions src/monitor/9.1/azurelinux-distroless/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
ARG REPO=mcr.microsoft.com/dotnet/monitor/base

# Installer image
FROM mcr.microsoft.com/azurelinux/base/core:3.0 AS installer

RUN tdnf install -y \
ca-certificates \
gzip \
tar \
&& tdnf clean all

# Retrieve .NET Monitor extensions
RUN dotnet_monitor_extension_version=9.1.0-alpha.1.25104.5 \
&& curl -fSL --output dotnet-monitor-egress-azureblobstorage.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
&& dotnet_monitor_extension_sha512='e03781f946d624890e0be426d15f638e9c6624dbb4b53b0a0cfd6d3334a82921e3ec148f313556368e6956d7dbe296e284c2b1a1dff4dae105827fe55ebfca6d' \
&& echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
\
&& curl -fSL --output dotnet-monitor-egress-s3storage.tar.gz https://ci.dot.net/public/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-arm64.tar.gz \
&& dotnet_monitor_extension_sha512='1f63bed827cbe1dcd508bfaf8ccab40e7d0338450cc9bf0829cc2d1e5c6fe90b1de6fb687aba356071d50794c858ec1a1330990c11e91fe64a2db48c305cbfc6' \
&& echo "$dotnet_monitor_extension_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
\
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-egress-azureblobstorage.tar.gz -C /app \
&& rm dotnet-monitor-egress-azureblobstorage.tar.gz \
&& tar -oxzf dotnet-monitor-egress-s3storage.tar.gz -C /app \
&& rm dotnet-monitor-egress-s3storage.tar.gz


# .NET Monitor image
FROM $REPO:9.1.0-alpha.1-arm64v8

COPY --from=installer ["/app", "/app"]
1 change: 1 addition & 0 deletions tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public readonly record struct ImageVersion
public static readonly ImageVersion V8_1 = new(new Version(8, 1), isPreview: false);
public static readonly ImageVersion V9_0 = new(new Version(9, 0), isPreview: false);
public static readonly ImageVersion V9_0_Preview = new(new Version(9, 0), isPreview: true);
public static readonly ImageVersion V9_1_Preview = new(new Version(9, 1), isPreview: false);
public static readonly ImageVersion V10_0_Preview = new(new Version(10, 0), isPreview: true);

public ImageVersion(Version version, bool isPreview)
Expand Down
4 changes: 3 additions & 1 deletion tests/Microsoft.DotNet.Docker.Tests/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,9 @@ public static class TestData
new ProductImageData { Version = V8_1, VersionFamily = V8_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Amd64, SupportedImageRepos = DotNetImageRepo.Monitor },
new ProductImageData { Version = V8_1, VersionFamily = V8_0, OS = OS.Mariner20Distroless, OSTag = OS.MarinerDistroless, Arch = Arch.Arm64, SupportedImageRepos = DotNetImageRepo.Monitor },
new ProductImageData { Version = V9_0, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "", Arch = Arch.Amd64, SupportedImageRepos = DotNetImageRepo.Monitor },
new ProductImageData { Version = V9_0, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "", Arch = Arch.Arm64, SupportedImageRepos = DotNetImageRepo.Monitor }
new ProductImageData { Version = V9_0, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "", Arch = Arch.Arm64, SupportedImageRepos = DotNetImageRepo.Monitor },
new ProductImageData { Version = V9_1_Preview, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "", Arch = Arch.Amd64, SupportedImageRepos = DotNetImageRepo.Monitor },
new ProductImageData { Version = V9_1_Preview, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "", Arch = Arch.Arm64, SupportedImageRepos = DotNetImageRepo.Monitor }
};

private static readonly ProductImageData[] s_windowsMonitorTestData =
Expand Down
Loading
Loading