diff --git a/.portal-docs/mar/README.dashboard.portal.md b/.portal-docs/mar/README.dashboard.portal.md index f02b72f73d..aa37836b57 100644 --- a/.portal-docs/mar/README.dashboard.portal.md +++ b/.portal-docs/mar/README.dashboard.portal.md @@ -2,8 +2,8 @@ ## Featured Tags -* `13` - * `docker pull mcr.microsoft.com/aspire/nightly/dashboard:13` +* `17` + * `docker pull mcr.microsoft.com/aspire/nightly/dashboard:17` ## About @@ -14,7 +14,7 @@ The [Aspire Dashboard](https://aspire.dev/dashboard/standalone/) is a standalone Run the dashboard locally: ```console -docker run --rm -d --name aspire-dashboard -p 127.0.0.1:18888:18888 -p 127.0.0.1:4317:18889 -p 127.0.0.1:4318:18890 mcr.microsoft.com/aspire/nightly/dashboard:13 +docker run --rm -d --name aspire-dashboard -p 127.0.0.1:18888:18888 -p 127.0.0.1:4317:18889 -p 127.0.0.1:4318:18890 mcr.microsoft.com/aspire/nightly/dashboard:17 ``` Open `http://localhost:18888`. To sign in, use the login URL or token printed in the container logs: diff --git a/README.aspire-dashboard.md b/README.aspire-dashboard.md index 4c3d70be46..26b85984f1 100644 --- a/README.aspire-dashboard.md +++ b/README.aspire-dashboard.md @@ -4,8 +4,8 @@ ## Featured Tags -* `13` - * `docker pull mcr.microsoft.com/aspire/nightly/dashboard:13` +* `17` + * `docker pull mcr.microsoft.com/aspire/nightly/dashboard:17` ## About @@ -16,7 +16,7 @@ The [Aspire Dashboard](https://aspire.dev/dashboard/standalone/) is a standalone Run the dashboard locally: ```console -docker run --rm -d --name aspire-dashboard -p 127.0.0.1:18888:18888 -p 127.0.0.1:4317:18889 -p 127.0.0.1:4318:18890 mcr.microsoft.com/aspire/nightly/dashboard:13 +docker run --rm -d --name aspire-dashboard -p 127.0.0.1:18888:18888 -p 127.0.0.1:4317:18889 -p 127.0.0.1:4318:18890 mcr.microsoft.com/aspire/nightly/dashboard:17 ``` Open `http://localhost:18888`. To sign in, use the login URL or token printed in the container logs: @@ -55,13 +55,13 @@ For applications in other containers, use the dashboard container's name and por Tags | Dockerfile | OS Version ---- | ---------- | ---------- -13.6.1, 13.6, 13, latest | [Dockerfile](src/aspire-dashboard/amd64/Dockerfile) | Azure Linux 3.0 +17.0.0, 17.0, 17, latest | [Dockerfile](src/aspire-dashboard/amd64/Dockerfile) | Azure Linux 3.0 ### Linux arm64 Tags Tags | Dockerfile | OS Version ---- | ---------- | ---------- -13.6.1, 13.6, 13, latest | [Dockerfile](src/aspire-dashboard/arm64v8/Dockerfile) | Azure Linux 3.0 +17.0.0, 17.0, 17, latest | [Dockerfile](src/aspire-dashboard/arm64v8/Dockerfile) | Azure Linux 3.0 diff --git a/eng/readme-templates/README.aspire-dashboard.md b/eng/readme-templates/README.aspire-dashboard.md index 61a396e24c..1ec50d6637 100644 --- a/eng/readme-templates/README.aspire-dashboard.md +++ b/eng/readme-templates/README.aspire-dashboard.md @@ -18,8 +18,8 @@ }}{{h}} Featured Tags -* `13` - * `docker pull {{FULL_REPO}}:13` +* `{{VARIABLES["aspire-dashboard|major-tag"]}}` + * `docker pull {{FULL_REPO}}:{{VARIABLES["aspire-dashboard|major-tag"]}}` {{h}} About @@ -32,7 +32,7 @@ For preview builds, see the [nightly Aspire Dashboard image](https://mcr.microso Run the dashboard locally: ```console -docker run --rm -d --name aspire-dashboard -p 127.0.0.1:18888:18888 -p 127.0.0.1:4317:18889 -p 127.0.0.1:4318:18890 {{FULL_REPO}}:13 +docker run --rm -d --name aspire-dashboard -p 127.0.0.1:18888:18888 -p 127.0.0.1:4317:18889 -p 127.0.0.1:4318:18890 {{FULL_REPO}}:{{VARIABLES["aspire-dashboard|major-tag"]}} ``` Open `http://localhost:18888`. To sign in, use the login URL or token printed in the container logs: diff --git a/manifest.json b/manifest.json index a701002fbb..bf31499094 100644 --- a/manifest.json +++ b/manifest.json @@ -5,7 +5,6 @@ }, "registry": "mcr.microsoft.com", "variables": { - "syndicatedAspireDashboardRepo": "dotnet/nightly/aspire-dashboard", "syndicatedRuntimeDepsRepo": "dotnet/core-nightly/runtime-deps", "syndicatedRuntimeRepo": "dotnet/core-nightly/runtime", "syndicatedAspnetRepo": "dotnet/core-nightly/aspnet", @@ -13230,7 +13229,6 @@ "images": [ { "productVersion": "$(aspire-dashboard|product-version)", - "syndication": "$(syndicatedAspireDashboardRepo)", "sharedTags": { "$(aspire-dashboard|fixed-tag)": {}, "$(aspire-dashboard|minor-tag)": {}, diff --git a/manifest.versions.json b/manifest.versions.json index c9ab08a652..4ca7c873ea 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -21,13 +21,13 @@ "alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)", "alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)", - "aspire-dashboard|build-version": "13.6.1-preview.1.26506.6", - "aspire-dashboard|product-version": "13.6.1", - "aspire-dashboard|fixed-tag": "13.6.1", - "aspire-dashboard|minor-tag": "13.6", - "aspire-dashboard|major-tag": "13", - "aspire-dashboard|linux|x64|sha": "a33356021639ad2ebaa26edcc6c1b3c457984f3f48e9650bdea721ad27254291f220168c85c13b202a2b6c8f1c060914b02ced39961a15e7d130d573cc7f91b2", - "aspire-dashboard|linux|arm64|sha": "fc72aa3cf8b8f225537e29dd6856d8787713943997703418e4cfa9fa084e2720d17836bc1b1f67bf37efa451f2ebcb8eca27908aa8c31a13a3182875a71020d6", + "aspire-dashboard|build-version": "17.0.0-preview.1.26514.11", + "aspire-dashboard|product-version": "17.0.0", + "aspire-dashboard|fixed-tag": "17.0.0", + "aspire-dashboard|minor-tag": "17.0", + "aspire-dashboard|major-tag": "17", + "aspire-dashboard|linux|x64|sha": "0bd4e1b9afef9ab194fdfdfa2c4616d3ce3a41787c6f94e102e33f175bffacbfe69434b4e5d179d58bc289f5b7f6f2eaf8314758324e38fa47cbd0060855bf04", + "aspire-dashboard|linux|arm64|sha": "f9f5a6eb940231e9e89cf77905e0512073d6acf97dcbe530b8373c572230c4a5f25e83760e4e8448132281ee9075448b894c938217b1d46367ed7b2a21d0221c", "aspire-dashboard|base-url|main": "$(base-url|public|preview|nightly)", "aspire-dashboard|base-url|nightly": "$(base-url|public|preview|nightly)", diff --git a/src/aspire-dashboard/amd64/Dockerfile b/src/aspire-dashboard/amd64/Dockerfile index feaabbea92..411ca998b3 100644 --- a/src/aspire-dashboard/amd64/Dockerfile +++ b/src/aspire-dashboard/amd64/Dockerfile @@ -9,9 +9,9 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve Aspire Dashboard -RUN dotnet_aspire_version=13.6.1-preview.1.26506.6 \ +RUN dotnet_aspire_version=17.0.0-preview.1.26514.11 \ && curl --fail --show-error --location --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-x64.zip \ - && aspire_dashboard_sha512='a33356021639ad2ebaa26edcc6c1b3c457984f3f48e9650bdea721ad27254291f220168c85c13b202a2b6c8f1c060914b02ced39961a15e7d130d573cc7f91b2' \ + && aspire_dashboard_sha512='0bd4e1b9afef9ab194fdfdfa2c4616d3ce3a41787c6f94e102e33f175bffacbfe69434b4e5d179d58bc289f5b7f6f2eaf8314758324e38fa47cbd0060855bf04' \ && echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \ && mkdir --parents /app \ && unzip aspire_dashboard.zip -d /app \ diff --git a/src/aspire-dashboard/arm64v8/Dockerfile b/src/aspire-dashboard/arm64v8/Dockerfile index b269d87c79..cf6c989def 100644 --- a/src/aspire-dashboard/arm64v8/Dockerfile +++ b/src/aspire-dashboard/arm64v8/Dockerfile @@ -9,9 +9,9 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve Aspire Dashboard -RUN dotnet_aspire_version=13.6.1-preview.1.26506.6 \ +RUN dotnet_aspire_version=17.0.0-preview.1.26514.11 \ && curl --fail --show-error --location --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-arm64.zip \ - && aspire_dashboard_sha512='fc72aa3cf8b8f225537e29dd6856d8787713943997703418e4cfa9fa084e2720d17836bc1b1f67bf37efa451f2ebcb8eca27908aa8c31a13a3182875a71020d6' \ + && aspire_dashboard_sha512='f9f5a6eb940231e9e89cf77905e0512073d6acf97dcbe530b8373c572230c4a5f25e83760e4e8448132281ee9075448b894c938217b1d46367ed7b2a21d0221c' \ && echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \ && mkdir --parents /app \ && unzip aspire_dashboard.zip -d /app \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/AspireDashboardManifestTests.cs b/tests/Microsoft.DotNet.Docker.Tests/AspireDashboardManifestTests.cs index aea4a37ebf..da5583ee91 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/AspireDashboardManifestTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/AspireDashboardManifestTests.cs @@ -14,8 +14,6 @@ namespace Microsoft.DotNet.Docker.Tests; public sealed class AspireDashboardManifestTests { private const string AspireDashboardId = "aspire-dashboard"; - private const string SyndicatedRepoVariable = "$(syndicatedAspireDashboardRepo)"; - [Theory] [InlineData("", "aspire/dashboard")] [InlineData("/nightly", "aspire/nightly/dashboard")] @@ -35,32 +33,6 @@ public void Manifest_UsesCanonicalRepoName() GetAspireDashboardRepo().Value("name")); } - [Fact] - public void LegacySyndication_IsLimitedToAspire13() - { - int majorVersion = int.Parse(Config.GetVariableValue("aspire-dashboard|major-tag")); - JObject aspireDashboardRepo = GetAspireDashboardRepo(); - JArray images = Assert.IsType(aspireDashboardRepo["images"]); - JObject image = Assert.IsType(Assert.Single(images)); - string? syndicatedRepo = image.Value("syndication"); - - if (majorVersion != 13) - { - Assert.Null(syndicatedRepo); - return; - } - - string branch = Config.GetVariableValue("branch"); - string expectedLegacyRepo = branch == "nightly" - ? "dotnet/nightly/aspire-dashboard" - : "dotnet/aspire-dashboard"; - - Assert.Equal( - expectedLegacyRepo, - Config.Manifest.Value["variables"]?["syndicatedAspireDashboardRepo"]?.Value()); - Assert.Equal(SyndicatedRepoVariable, syndicatedRepo); - } - private static JObject GetAspireDashboardRepo() => Config.Manifest.Value["repos"]! .Children() diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs index 82d0bf7ba6..f4fcdc674f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs @@ -14,10 +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_1 = new(new Version(9, 1), isPreview: false); - public static readonly ImageVersion V13_2 = new(new Version(13, 2), isPreview: false); - public static readonly ImageVersion V13_3 = new(new Version(13, 3), isPreview: false); - public static readonly ImageVersion V13_5 = new(new Version(13, 5), isPreview: false); - public static readonly ImageVersion V13_6 = new(new Version(13, 6), isPreview: false); + public static readonly ImageVersion V17_0 = new(new Version(17, 0), isPreview: false); public static readonly ImageVersion V9_2_Preview = new(new Version(9, 2), isPreview: true); public static readonly ImageVersion V10_0 = new(new Version(10, 0), isPreview: false); public static readonly ImageVersion V11_0 = new(new Version(11, 0), isPreview: false); diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index 1be03bdece..5408c61ca5 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -461,7 +461,7 @@ public static class TestData private static readonly ProductImageData[] s_AspireDashboardTestData = { new() { - Version = V13_6, + Version = V17_0, VersionFamily = V11_0, OS = OS.AzureLinux30Distroless, OSTag = "", @@ -470,7 +470,7 @@ public static class TestData SupportedImageRepos = DotNetImageRepo.Aspire_Dashboard, }, new() { - Version = V13_6, + Version = V17_0, VersionFamily = V11_0, OS = OS.AzureLinux30Distroless, OSTag = "",