From 5b17bb40b856dfa543ed51347605fc2f319720a6 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 12 Nov 2024 13:16:11 -0800 Subject: [PATCH] Finish removing Aspire Dashboard 8.2 images --- README.aspire-dashboard.md | 2 +- eng/readme-templates/FeaturedTags.md | 2 +- .../cbl-mariner-distroless/amd64/Dockerfile | 35 ------------------- .../cbl-mariner-distroless/arm64v8/Dockerfile | 35 ------------------- .../performance/ImageSize.nightly.linux.json | 2 -- 5 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 src/aspire-dashboard/8.2/cbl-mariner-distroless/amd64/Dockerfile delete mode 100644 src/aspire-dashboard/8.2/cbl-mariner-distroless/arm64v8/Dockerfile diff --git a/README.aspire-dashboard.md b/README.aspire-dashboard.md index aac9ee5c62..e02d838cc5 100644 --- a/README.aspire-dashboard.md +++ b/README.aspire-dashboard.md @@ -7,7 +7,7 @@ ## Featured Tags * `9.0` - * `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:8.2` + * `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.0` ## About diff --git a/eng/readme-templates/FeaturedTags.md b/eng/readme-templates/FeaturedTags.md index f509cfed5b..6ee4fb5458 100644 --- a/eng/readme-templates/FeaturedTags.md +++ b/eng/readme-templates/FeaturedTags.md @@ -21,7 +21,7 @@ elif match(REPO, "monitor/base"):* `9` (Standard Support) * `8` (Long-Term Support) * `docker pull {{FULL_REPO}}:8`^ elif match(REPO, "aspire-dashboard"):* `9.0` - * `docker pull {{FULL_REPO}}:8.2`^ + * `docker pull {{FULL_REPO}}:9.0`^ else:* `9.0` (Standard Support) * `docker pull {{FULL_REPO}}:9.0` * `8.0` (Long-Term Support) diff --git a/src/aspire-dashboard/8.2/cbl-mariner-distroless/amd64/Dockerfile b/src/aspire-dashboard/8.2/cbl-mariner-distroless/amd64/Dockerfile deleted file mode 100644 index ddeafb4187..0000000000 --- a/src/aspire-dashboard/8.2/cbl-mariner-distroless/amd64/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/aspnet - -# Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer - -RUN tdnf install -y \ - ca-certificates \ - unzip \ - && tdnf clean all - -# Retrieve Aspire Dashboard -RUN dotnet_aspire_version=8.2.1-preview.1.24473.4 \ - && curl -fSL --output aspire_dashboard.zip https://dotnetbuilds.azureedge.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-x64.zip \ - && aspire_dashboard_sha512='df4c189f4fecb3284de436c04ab42aaf4888a0929f04c95ba3e1774e07045032cc8e77f570f2cf186fd2db12e385e866732dd98882f06ee0e5489d566d09b667' \ - && echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \ - && mkdir -p /app \ - && unzip aspire_dashboard.zip -d /app \ - && rm aspire_dashboard.zip - - -# Aspire Dashboard image -FROM $REPO:8.0.11-cbl-mariner2.0-distroless-extra-amd64 - -WORKDIR /app -COPY --from=installer /app . - -ENV \ - # Unset ASPNETCORE_HTTP_PORTS from base image - ASPNETCORE_HTTP_PORTS= \ - # Aspire Dashboard environment variables - ASPNETCORE_URLS=http://0.0.0.0:18888 \ - DOTNET_DASHBOARD_OTLP_ENDPOINT_URL=http://0.0.0.0:18889 \ - DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL=http://0.0.0.0:18890 - -ENTRYPOINT [ "dotnet", "/app/Aspire.Dashboard.dll" ] diff --git a/src/aspire-dashboard/8.2/cbl-mariner-distroless/arm64v8/Dockerfile b/src/aspire-dashboard/8.2/cbl-mariner-distroless/arm64v8/Dockerfile deleted file mode 100644 index 3cc8f89dce..0000000000 --- a/src/aspire-dashboard/8.2/cbl-mariner-distroless/arm64v8/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -ARG REPO=mcr.microsoft.com/dotnet/aspnet - -# Installer image -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer - -RUN tdnf install -y \ - ca-certificates \ - unzip \ - && tdnf clean all - -# Retrieve Aspire Dashboard -RUN dotnet_aspire_version=8.2.1-preview.1.24473.4 \ - && curl -fSL --output aspire_dashboard.zip https://dotnetbuilds.azureedge.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-arm64.zip \ - && aspire_dashboard_sha512='c6d0a9da8e459dd64f24758b60cc8b587cbf1c1300188f924d28aea3ace483858b1bb1287782121067af00b9d5533a529a070e8b376f85f7775ffd03c4b193fd' \ - && echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \ - && mkdir -p /app \ - && unzip aspire_dashboard.zip -d /app \ - && rm aspire_dashboard.zip - - -# Aspire Dashboard image -FROM $REPO:8.0.11-cbl-mariner2.0-distroless-extra-arm64v8 - -WORKDIR /app -COPY --from=installer /app . - -ENV \ - # Unset ASPNETCORE_HTTP_PORTS from base image - ASPNETCORE_HTTP_PORTS= \ - # Aspire Dashboard environment variables - ASPNETCORE_URLS=http://0.0.0.0:18888 \ - DOTNET_DASHBOARD_OTLP_ENDPOINT_URL=http://0.0.0.0:18889 \ - DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL=http://0.0.0.0:18890 - -ENTRYPOINT [ "dotnet", "/app/Aspire.Dashboard.dll" ] diff --git a/tests/performance/ImageSize.nightly.linux.json b/tests/performance/ImageSize.nightly.linux.json index c3b61b0c20..e47a714774 100644 --- a/tests/performance/ImageSize.nightly.linux.json +++ b/tests/performance/ImageSize.nightly.linux.json @@ -396,8 +396,6 @@ "src/monitor-base/9.0/azurelinux-distroless/arm64v8": 141390045 }, "dotnet/nightly/aspire-dashboard": { - "src/aspire-dashboard/8.2/cbl-mariner-distroless/amd64": 142036038, - "src/aspire-dashboard/8.2/cbl-mariner-distroless/arm64v8": 148315271, "src/aspire-dashboard/9.0/cbl-mariner-distroless/amd64": 142036038, "src/aspire-dashboard/9.0/cbl-mariner-distroless/arm64v8": 148315271 }