Skip to content

Commit d2797c0

Browse files
lbusselllbussell
authored
Update Aspire Dashboard to 8.0 (#5482)
1 parent 4a8b63a commit d2797c0

File tree

10 files changed

+22
-27
lines changed

10 files changed

+22
-27
lines changed

‎.mar/portal/README.aspire-dashboard.portal.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori
66

77
## Featured Tags
88

9-
* `8.0-preview` (Preview)
10-
* `docker pull mcr.microsoft.com/dotnet/aspire-dashboard:8.0-preview`
9+
* `8.0`
10+
* `docker pull mcr.microsoft.com/dotnet/aspire-dashboard:8.0`
1111

1212
## Related Repositories
1313

‎README.aspire-dashboard.md‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Featured Tags
22

3-
* `8.0-preview` (Preview)
4-
* `docker pull mcr.microsoft.com/dotnet/aspire-dashboard:8.0-preview`
3+
* `8.0`
4+
* `docker pull mcr.microsoft.com/dotnet/aspire-dashboard:8.0`
55

66
# About
77

@@ -107,16 +107,14 @@ Limits are per-resource. For example, a `MaxLogCount` value of 10,000 configures
107107
# Full Tag Listing
108108

109109
## Linux amd64 Tags
110-
##### .NET Aspire Dashboard Preview Tags
111110
Tags | Dockerfile | OS Version
112111
-----------| -------------| -------------
113-
8.0.0-preview.7-amd64, 8.0-preview-amd64, 8.0.0-preview.7, 8.0-preview, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspire-dashboard/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
112+
8.0.0-amd64, 8.0-amd64, 8.0.0, 8.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspire-dashboard/8.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
114113

115114
## Linux arm64 Tags
116-
##### .NET Aspire Dashboard Preview Tags
117115
Tags | Dockerfile | OS Version
118116
-----------| -------------| -------------
119-
8.0.0-preview.7-arm64v8, 8.0-preview-arm64v8, 8.0.0-preview.7, 8.0-preview, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspire-dashboard/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
117+
8.0.0-arm64v8, 8.0-arm64v8, 8.0.0, 8.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/aspire-dashboard/8.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
120118

121119
You can retrieve a list of all available tags for dotnet/aspire-dashboard at https://mcr.microsoft.com/v2/dotnet/aspire-dashboard/tags/list.
122120
<!--End of generated tags-->

‎eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
$(McrTagsYmlRepo:aspire-dashboard)
2-
$(McrTagsYmlTagGroup:8.0-preview-amd64)
3-
customSubTableTitle: .NET Aspire Dashboard Preview Tags
4-
$(McrTagsYmlTagGroup:8.0-preview-arm64v8)
5-
customSubTableTitle: .NET Aspire Dashboard Preview Tags
2+
$(McrTagsYmlTagGroup:8.0-amd64)
3+
$(McrTagsYmlTagGroup:8.0-arm64v8)

‎eng/readme-templates/FeaturedTags.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ elif match(SHORT_REPO, "monitor"):* `8` (Long-Term Support)
1818
* `docker pull {{FULL_REPO}}:6`^
1919
elif match(REPO, "monitor/base"):* `8` (Long-Term Support)
2020
* `docker pull {{FULL_REPO}}:8`^
21-
elif match(REPO, "aspire-dashboard"):* `8.0-preview` (Preview)
22-
* `docker pull {{FULL_REPO}}:8.0-preview`^
21+
elif match(REPO, "aspire-dashboard"):* `8.0`
22+
* `docker pull {{FULL_REPO}}:8.0`^
2323
else:{{if VARIABLES["branch"] = "nightly":* `9.0-preview` (Preview)
2424
* `docker pull {{FULL_REPO}}:9.0-preview`
2525
}}* `8.0` (Long-Term Support)

‎manifest.versions.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"variables": {
3-
"aspire-dashboard|8.0|build-version": "8.0.0-preview.7.24251.11",
4-
"aspire-dashboard|8.0|product-version": "8.0.0-preview.7",
3+
"aspire-dashboard|8.0|build-version": "8.0.0",
4+
"aspire-dashboard|8.0|product-version": "8.0.0",
55
"aspire-dashboard|8.0|fixed-tag": "$(aspire-dashboard|8.0|product-version)",
6-
"aspire-dashboard|8.0|floating-tag": "8.0-preview",
7-
"aspire-dashboard|8.0|linux|x64|sha": "8c923e139d28baba92901456fee1bfbe31f037a405d6754ed6acadaf8775399be4d6afb33bf9d5d374e2966e3227fd3faa7519e7aceee84bb65652d8ca13ad4b",
8-
"aspire-dashboard|8.0|linux|arm64|sha": "c813c30436aefc9cf70cfc10959fb218ead8dd6230490ed03af912a6cfa5686b808df2893257a3206b03449702f9957fd9064083fc29c2aace44c2bc8957302f",
6+
"aspire-dashboard|8.0|floating-tag": "8.0",
7+
"aspire-dashboard|8.0|linux|x64|sha": "c1ac2ee31d9a6604f7b5682640cf9ea4f3abda13f4b0b68758c178d5687921a2c862022e8493549532647dddfe72a19fca1d75bffd294fc1d5149db0eb5ed746",
8+
"aspire-dashboard|8.0|linux|arm64|sha": "c3d3fb731f872fec922706a58bfd96db50e03fa5581f80641e64afbd2cf2b523c761e99a415189fa4a9de6093c5b3f57c88318e507b740500b506dd6d6b57b48",
99

1010
"aspnet|6.0|build-version": "6.0.30",
1111
"aspnet|6.0|targeting-pack-version": "$(aspnet|6.0|build-version)",

‎src/aspire-dashboard/8.0/cbl-mariner-distroless/amd64/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ RUN tdnf install -y \
99
&& tdnf clean all
1010

1111
# Retrieve Aspire Dashboard
12-
RUN dotnet_aspire_version=8.0.0-preview.7.24251.11 \
12+
RUN dotnet_aspire_version=8.0.0 \
1313
&& curl -fSL --output aspire_dashboard.zip https://dotnetbuilds.azureedge.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-x64.zip \
14-
&& aspire_dashboard_sha512='8c923e139d28baba92901456fee1bfbe31f037a405d6754ed6acadaf8775399be4d6afb33bf9d5d374e2966e3227fd3faa7519e7aceee84bb65652d8ca13ad4b' \
14+
&& aspire_dashboard_sha512='c1ac2ee31d9a6604f7b5682640cf9ea4f3abda13f4b0b68758c178d5687921a2c862022e8493549532647dddfe72a19fca1d75bffd294fc1d5149db0eb5ed746' \
1515
&& echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \
1616
&& mkdir -p /app \
1717
&& unzip aspire_dashboard.zip -d /app \

‎src/aspire-dashboard/8.0/cbl-mariner-distroless/arm64v8/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ RUN tdnf install -y \
99
&& tdnf clean all
1010

1111
# Retrieve Aspire Dashboard
12-
RUN dotnet_aspire_version=8.0.0-preview.7.24251.11 \
12+
RUN dotnet_aspire_version=8.0.0 \
1313
&& curl -fSL --output aspire_dashboard.zip https://dotnetbuilds.azureedge.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-arm64.zip \
14-
&& aspire_dashboard_sha512='c813c30436aefc9cf70cfc10959fb218ead8dd6230490ed03af912a6cfa5686b808df2893257a3206b03449702f9957fd9064083fc29c2aace44c2bc8957302f' \
14+
&& aspire_dashboard_sha512='c3d3fb731f872fec922706a58bfd96db50e03fa5581f80641e64afbd2cf2b523c761e99a415189fa4a9de6093c5b3f57c88318e507b740500b506dd6d6b57b48' \
1515
&& echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \
1616
&& mkdir -p /app \
1717
&& unzip aspire_dashboard.zip -d /app \

‎tests/Microsoft.DotNet.Docker.Tests/DockerHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public string BuildDistrolessHelper(DotNetImageRepo imageRepo, ProductImageData
8181
{
8282
// Special case for .NET 8.0 Aspire Dashboard images - the Dashboard is in preview even though
8383
// .NET 8.0 is not. The distroless helper image should not be built with the preview version.
84-
Version = imageData.Version == ImageVersion.V8_0_Preview ? ImageVersion.V8_0 : imageData.VersionFamily,
84+
Version = imageData.VersionFamily,
8585
OS = imageData.OS,
8686
Arch = imageData.Arch,
8787
};

‎tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public readonly record struct ImageVersion
1515
public static readonly ImageVersion V7_0 = new(new Version(7, 0), isPreview: false);
1616
public static readonly ImageVersion V7_3 = new(new Version(7, 3), isPreview: false);
1717
public static readonly ImageVersion V8_0 = new(new Version(8, 0), isPreview: false);
18-
public static readonly ImageVersion V8_0_Preview = new(new Version(8, 0), isPreview: true);
1918
public static readonly ImageVersion V8_1 = new(new Version(8, 1), isPreview: true);
2019
public static readonly ImageVersion V9_0 = new(new Version(9, 0), isPreview: true);
2120

‎tests/Microsoft.DotNet.Docker.Tests/TestData.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,15 +341,15 @@ public static class TestData
341341
private static readonly ProductImageData[] s_AspireDashboardTestData =
342342
{
343343
new() {
344-
Version = V8_0_Preview,
344+
Version = V8_0,
345345
OS = OS.Mariner20Distroless,
346346
OSTag = "",
347347
OSDir = OS.MarinerDistroless,
348348
Arch = Arch.Amd64,
349349
SupportedImageRepos = DotNetImageRepo.Aspire_Dashboard,
350350
},
351351
new() {
352-
Version = V8_0_Preview,
352+
Version = V8_0,
353353
OS = OS.Mariner20Distroless,
354354
OSTag = "",
355355
OSDir = OS.MarinerDistroless,

0 commit comments

Comments
 (0)