Skip to content

Update Aspire image to 9.3 #6455

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

Merged
lbussell merged 4 commits into from
May 19, 2025
Merged

Update Aspire image to 9.3 #6455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7009c39
Update image to aspire 9.3
joperezr May 19, 2025
fc03d74
Fix test issue
joperezr May 19, 2025
d013701
Regen Dockerfiles
lbussell May 19, 2025
ccfe61e
Update test baselines
lbussell May 19, 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 .portal-docs/docker-hub/README.aspire-dashboard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

# Featured Tags

* `9.2`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.2`
* `9.3`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.3`

# About

Expand Down
4 changes: 2 additions & 2 deletions .portal-docs/mar/README.aspire-dashboard.portal.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori

## Featured Tags

* `9.2`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.2`
* `9.3`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.3`

## Related Repositories

Expand Down
8 changes: 4 additions & 4 deletions README.aspire-dashboard.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

## Featured Tags

* `9.2`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.2`
* `9.3`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.3`

## About

Expand Down Expand Up @@ -118,13 +118,13 @@ Limits are per-resource. For example, a `MaxLogCount` value of 10,000 configures

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.2.0, 9.2, 9, latest | [Dockerfile](src/aspire-dashboard/9.2/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0
9.3.0, 9.3, 9, latest | [Dockerfile](src/aspire-dashboard/9.3/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0

### Linux arm64 Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.2.0, 9.2, 9, latest | [Dockerfile](src/aspire-dashboard/9.2/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
9.3.0, 9.3, 9, latest | [Dockerfile](src/aspire-dashboard/9.3/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
2 changes: 1 addition & 1 deletion eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
$(McrTagsYmlRepo:aspire-dashboard)
$(McrTagsYmlTagGroup:9.2)
$(McrTagsYmlTagGroup:9.3)
4 changes: 2 additions & 2 deletions eng/readme-templates/FeaturedTags.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ elif match(REPO, "monitor/base"):* `9` (Standard Support)
* `docker pull {{FULL_REPO}}:9`
* `8` (Long-Term Support)
* `docker pull {{FULL_REPO}}:8`^
elif match(REPO, "aspire-dashboard"):* `9.2`
* `docker pull {{FULL_REPO}}:9.2`^
elif match(REPO, "aspire-dashboard"):* `9.3`
* `docker pull {{FULL_REPO}}:9.3`^
elif match(REPO, "yarp"):* `2.3-preview`
* `docker pull {{FULL_REPO}}:2.3-preview`^
else:{{if VARIABLES["branch"] = "nightly":* `10.0-preview` (Preview)
Expand Down
18 changes: 9 additions & 9 deletions manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9378,10 +9378,10 @@
"mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml",
"images": [
{
"productVersion": "$(aspire-dashboard|9.2|product-version)",
"productVersion": "$(aspire-dashboard|9.3|product-version)",
"sharedTags": {
"$(aspire-dashboard|9.2|fixed-tag)": {},
"$(aspire-dashboard|9.2|minor-tag)": {},
"$(aspire-dashboard|9.3|fixed-tag)": {},
"$(aspire-dashboard|9.3|minor-tag)": {},
"$(aspire-dashboard|9|major-tag)": {},
"latest": {}
},
Expand All @@ -9390,15 +9390,15 @@
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/aspire-dashboard/9.2/azurelinux-distroless/amd64",
"dockerfile": "src/aspire-dashboard/9.3/azurelinux-distroless/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux",
"os": "linux",
"osVersion": "azurelinux3.0-distroless",
"tags": {
"$(aspire-dashboard|9.2|fixed-tag)-amd64": {
"$(aspire-dashboard|9.3|fixed-tag)-amd64": {
"docType": "Undocumented"
},
"$(aspire-dashboard|9.2|minor-tag)-amd64": {
"$(aspire-dashboard|9.3|minor-tag)-amd64": {
"docType": "Undocumented"
},
"$(aspire-dashboard|9|major-tag)-amd64": {
Expand All @@ -9411,15 +9411,15 @@
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/aspire-dashboard/9.2/azurelinux-distroless/arm64v8",
"dockerfile": "src/aspire-dashboard/9.3/azurelinux-distroless/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux",
"os": "linux",
"osVersion": "azurelinux3.0-distroless",
"tags": {
"$(aspire-dashboard|9.2|fixed-tag)-arm64v8": {
"$(aspire-dashboard|9.3|fixed-tag)-arm64v8": {
"docType": "Undocumented"
},
"$(aspire-dashboard|9.2|minor-tag)-arm64v8": {
"$(aspire-dashboard|9.3|minor-tag)-arm64v8": {
"docType": "Undocumented"
},
"$(aspire-dashboard|9|major-tag)-arm64v8": {
Expand Down
16 changes: 8 additions & 8 deletions manifest.versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)",
"alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)",

"aspire-dashboard|9.2|build-version": "9.2.0-preview.1.25209.2",
"aspire-dashboard|9.2|product-version": "9.2.0",
"aspire-dashboard|9.2|fixed-tag": "$(aspire-dashboard|9.2|product-version)",
"aspire-dashboard|9.2|minor-tag": "9.2",
"aspire-dashboard|9.3|build-version": "9.3.0-preview.1.25265.20",
"aspire-dashboard|9.3|product-version": "9.3.0",
"aspire-dashboard|9.3|fixed-tag": "$(aspire-dashboard|9.3|product-version)",
"aspire-dashboard|9.3|minor-tag": "9.3",
"aspire-dashboard|9|major-tag": "9",
"aspire-dashboard|9.2|linux|x64|sha": "e65595b852cdb6f48e98088776891969fd1d5a411ab1a693618cf71ad4d6d600dbf627466141a932f8de7c24ab3e414353ab8870b826b0680b676ea22d1671cb",
"aspire-dashboard|9.2|linux|arm64|sha": "61760dfb33302b4886d8132d94b04df762e18db4bdb4097024328430f25595dcffd696df91ace2924bbf49561fa28bba1dc83e508b172e09eb76165b0227d5b2",
"aspire-dashboard|9.2|base-url|main": "$(base-url|public|preview|nightly)",
"aspire-dashboard|9.2|base-url|nightly": "$(base-url|public|preview|nightly)",
"aspire-dashboard|9.3|linux|x64|sha": "d0bdcfb0ac5697b07a49eff93e53c55cab3a50fd547b3ad4d9ac863f943327fa86d266c00ca23214e8811fa89f18f9b6be28411d1e504861a269ec2d592be037",
"aspire-dashboard|9.3|linux|arm64|sha": "30f865ca6b004c5f2ce2a43bf1c079d08a6200ef0f5d4969811abf335dd3a0509d4c258fb1edf97c3ed9f39419f8c8ee610eccf8d5adad60f641b0d220741bcb",
"aspire-dashboard|9.3|base-url|main": "$(base-url|public|preview|nightly)",
"aspire-dashboard|9.3|base-url|nightly": "$(base-url|public|preview|nightly)",

"aspnet|8.0|build-version": "8.0.16",
"aspnet|8.0|linux-musl|x64|sha": "2f8569e1335bd25a1c93be52364dd1386c60d70c5f905ca830093125de20bfd99be0808cf98f6aafd6a0bf0867962d7436a54ea7b8eb42a6fb31eeb5b08e39a2",
Expand Down
4 changes: 2 additions & 2 deletions ....2/azurelinux-distroless/amd64/Dockerfile → ....3/azurelinux-distroless/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve Aspire Dashboard
RUN dotnet_aspire_version=9.2.0-preview.1.25209.2 \
RUN dotnet_aspire_version=9.3.0-preview.1.25265.20 \
&& curl -fSL --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-x64.zip \
&& aspire_dashboard_sha512='e65595b852cdb6f48e98088776891969fd1d5a411ab1a693618cf71ad4d6d600dbf627466141a932f8de7c24ab3e414353ab8870b826b0680b676ea22d1671cb' \
&& aspire_dashboard_sha512='d0bdcfb0ac5697b07a49eff93e53c55cab3a50fd547b3ad4d9ac863f943327fa86d266c00ca23214e8811fa89f18f9b6be28411d1e504861a269ec2d592be037' \
&& echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \
&& mkdir -p /app \
&& unzip aspire_dashboard.zip -d /app \
Expand Down
4 changes: 2 additions & 2 deletions .../azurelinux-distroless/arm64v8/Dockerfile → .../azurelinux-distroless/arm64v8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve Aspire Dashboard
RUN dotnet_aspire_version=9.2.0-preview.1.25209.2 \
RUN dotnet_aspire_version=9.3.0-preview.1.25265.20 \
&& curl -fSL --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-arm64.zip \
&& aspire_dashboard_sha512='61760dfb33302b4886d8132d94b04df762e18db4bdb4097024328430f25595dcffd696df91ace2924bbf49561fa28bba1dc83e508b172e09eb76165b0227d5b2' \
&& aspire_dashboard_sha512='30f865ca6b004c5f2ce2a43bf1c079d08a6200ef0f5d4969811abf335dd3a0509d4c258fb1edf97c3ed9f39419f8c8ee610eccf8d5adad60f641b0d220741bcb' \
&& echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \
&& mkdir -p /app \
&& unzip aspire_dashboard.zip -d /app \
Expand Down
0 ...-distroless-amd64-Dockerfile.approved.txt → ...-distroless-amd64-Dockerfile.approved.txt
View file
Open in desktop
File renamed without changes.
0 ...istroless-arm64v8-Dockerfile.approved.txt → ...istroless-arm64v8-Dockerfile.approved.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public readonly record struct ImageVersion
public static readonly ImageVersion V9_0 = new(new Version(9, 0), isPreview: false);
public static readonly ImageVersion V9_1 = new(new Version(9, 1), isPreview: false);
public static readonly ImageVersion V9_1_Preview = new(new Version(9, 1), isPreview: true);
public static readonly ImageVersion V9_2 = new(new Version(9, 2), isPreview: false);
public static readonly ImageVersion V9_3 = new(new Version(9, 3), isPreview: false);
public static readonly ImageVersion V9_2_Preview = new(new Version(9, 2), isPreview: true);
public static readonly ImageVersion V10_0_Preview = new(new Version(10, 0), isPreview: true);

Expand Down
4 changes: 2 additions & 2 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 @@ -337,7 +337,7 @@ public static class TestData
private static readonly ProductImageData[] s_AspireDashboardTestData =
{
new() {
Version = V9_2,
Version = V9_3,
VersionFamily = V9_0,
OS = OS.AzureLinux30Distroless,
OSTag = "",
Expand All @@ -346,7 +346,7 @@ public static class TestData
SupportedImageRepos = DotNetImageRepo.Aspire_Dashboard,
},
new() {
Version = V9_2,
Version = V9_3,
VersionFamily = V9_0,
OS = OS.AzureLinux30Distroless,
OSTag = "",
Expand Down
Loading