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

Update Aspire Dashboard image to Azure Linux 3.0 #6280

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

Update Aspire Dashboard image to Azure Linux 3.0 #6280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35baa88
Update Aspire Dashboard image to Azure Linux 3.0
lbussell Feb 26, 2025
b531a0c
Merge branch 'nightly' into aspire-azlinux3
lbussell Feb 26, 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
4 changes: 2 additions & 2 deletions README.aspire-dashboard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ Limits are per-resource. For example, a `MaxLogCount` value of 10,000 configures

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-preview.1, 9.1-preview, 9-preview, latest | [Dockerfile](src/aspire-dashboard/9.1/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
9.1.0-preview.1, 9.1-preview, 9-preview, latest | [Dockerfile](src/aspire-dashboard/9.1/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0

### Linux arm64 Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.1.0-preview.1, 9.1-preview, 9-preview, latest | [Dockerfile](src/aspire-dashboard/9.1/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
9.1.0-preview.1, 9.1-preview, 9-preview, latest | [Dockerfile](src/aspire-dashboard/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/aspire-dashboard/tags/list) for all supported and unsupported tags.*
Expand Down
8 changes: 4 additions & 4 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10607,10 +10607,10 @@
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/aspire-dashboard/9.1/cbl-mariner-distroless/amd64",
"dockerfile": "src/aspire-dashboard/9.1/azurelinux-distroless/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux",
"os": "linux",
"osVersion": "cbl-mariner2.0-distroless",
"osVersion": "azurelinux3.0-distroless",
"tags": {
"$(aspire-dashboard|9.1|fixed-tag)-amd64": {
"docType": "Undocumented"
Expand All @@ -10628,10 +10628,10 @@
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/aspire-dashboard/9.1/cbl-mariner-distroless/arm64v8",
"dockerfile": "src/aspire-dashboard/9.1/azurelinux-distroless/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux",
"os": "linux",
"osVersion": "cbl-mariner2.0-distroless",
"osVersion": "azurelinux3.0-distroless",
"tags": {
"$(aspire-dashboard|9.1|fixed-tag)-arm64v8": {
"docType": "Undocumented"
Expand Down
4 changes: 2 additions & 2 deletions ...1/cbl-mariner-distroless/amd64/Dockerfile → ....1/azurelinux-distroless/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet

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

RUN tdnf install -y \
ca-certificates \
Expand All @@ -19,7 +19,7 @@ RUN dotnet_aspire_version=9.1.0-preview.1.25121.10 \


# Aspire Dashboard image
FROM $REPO:8.0.13-cbl-mariner2.0-distroless-extra-amd64
FROM $REPO:8.0.13-azurelinux3.0-distroless-extra-amd64

WORKDIR /app
COPY --from=installer /app .
Expand Down
4 changes: 2 additions & 2 deletions ...cbl-mariner-distroless/arm64v8/Dockerfile → .../azurelinux-distroless/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG REPO=mcr.microsoft.com/dotnet/aspnet

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

RUN tdnf install -y \
ca-certificates \
Expand All @@ -19,7 +19,7 @@ RUN dotnet_aspire_version=9.1.0-preview.1.25121.10 \


# Aspire Dashboard image
FROM $REPO:8.0.13-cbl-mariner2.0-distroless-extra-arm64v8
FROM $REPO:8.0.13-azurelinux3.0-distroless-extra-arm64v8

WORKDIR /app
COPY --from=installer /app .
Expand Down
4 changes: 2 additions & 2 deletions ...-distroless-amd64-Dockerfile.approved.txt → ...-distroless-amd64-Dockerfile.approved.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...istroless-arm64v8-Dockerfile.approved.txt → ...istroless-arm64v8-Dockerfile.approved.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions tests/Microsoft.DotNet.Docker.Tests/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,18 +413,18 @@ public static class TestData
new() {
Version = V9_1_Preview,
VersionFamily = V9_0,
OS = OS.Mariner20Distroless,
OS = OS.AzureLinux30Distroless,
OSTag = "",
OSDir = OS.MarinerDistroless,
OSDir = OS.AzureLinuxDistroless,
Arch = Arch.Amd64,
SupportedImageRepos = DotNetImageRepo.Aspire_Dashboard,
},
new() {
Version = V9_1_Preview,
VersionFamily = V9_0,
OS = OS.Mariner20Distroless,
OS = OS.AzureLinux30Distroless,
OSTag = "",
OSDir = OS.MarinerDistroless,
OSDir = OS.AzureLinuxDistroless,
Arch = Arch.Arm64,
SupportedImageRepos = DotNetImageRepo.Aspire_Dashboard
},
Expand Down
4 changes: 2 additions & 2 deletions tests/performance/ImageSize.nightly.linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@
"src/monitor-base/9.1/azurelinux-distroless/arm64v8": 141390045
},
"dotnet/nightly/aspire-dashboard": {
"src/aspire-dashboard/9.1/cbl-mariner-distroless/amd64": 142036038,
"src/aspire-dashboard/9.1/cbl-mariner-distroless/arm64v8": 148315271
"src/aspire-dashboard/9.1/azurelinux-distroless/amd64": 142036038,
"src/aspire-dashboard/9.1/azurelinux-distroless/arm64v8": 148315271
},
"dotnet/nightly/yarp": {
"src/yarp/2.3/azurelinux-distroless/amd64": 141557760,
Expand Down
Loading