-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'nightly' into nightly-UpdateDependencies-nightly-From-d…
…otnet-sdk
- Loading branch information
Showing
30 changed files
with
355 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,12 @@ | ||
ENV \ | ||
{{ | ||
set dotnetMajor to split(PRODUCT_VERSION, ".")[0] | ||
}}ENV \ | ||
# Unset ASPNETCORE_HTTP_PORTS from base image | ||
ASPNETCORE_HTTP_PORTS= \ | ||
# Aspire Dashboard environment variables | ||
ASPNETCORE_URLS=http://0.0.0.0:18888 \ | ||
{{if dotnetMajor = "8":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 | ||
DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL=http://0.0.0.0:18890^ | ||
else:ASPNETCORE_URLS=http://+:18888 \ | ||
DOTNET_DASHBOARD_OTLP_ENDPOINT_URL=http://+:18889 \ | ||
DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL=http://+:18890}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
$(McrTagsYmlRepo:aspire-dashboard) | ||
$(McrTagsYmlTagGroup:8.2) | ||
$(McrTagsYmlTagGroup:8) | ||
$(McrTagsYmlTagGroup:9.0-preview) | ||
$(McrTagsYmlTagGroup:9-preview) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/aspire-dashboard/9.0/cbl-mariner-distroless/amd64/Dockerfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
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=9.0.0-preview.4.24511.1 \ | ||
&& curl -fSL --output aspire_dashboard.zip https://dotnetbuilds.azureedge.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-x64.zip \ | ||
&& aspire_dashboard_sha512='d53df2c93730ff2fb6ebc16f5f7054352048fba31d77b887c60e6a6f48198017638fa69083a64eb0583ae68be5342be776b14de6442423f7d3511e4d5897dbea' \ | ||
&& 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.10-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://+:18888 \ | ||
DOTNET_DASHBOARD_OTLP_ENDPOINT_URL=http://+:18889 \ | ||
DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL=http://+:18890 | ||
|
||
ENTRYPOINT [ "dotnet", "/app/Aspire.Dashboard.dll" ] |
35 changes: 35 additions & 0 deletions
35
src/aspire-dashboard/9.0/cbl-mariner-distroless/arm64v8/Dockerfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
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=9.0.0-preview.4.24511.1 \ | ||
&& curl -fSL --output aspire_dashboard.zip https://dotnetbuilds.azureedge.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-arm64.zip \ | ||
&& aspire_dashboard_sha512='aedcc1170afeb9130aad3bb73b383ff58bee63b69019c03732c46df10396725f513bb79d8da33db3eab909a232fba808b3ed3ce6aa025270ba4813136d1954e4' \ | ||
&& 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.10-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://+:18888 \ | ||
DOTNET_DASHBOARD_OTLP_ENDPOINT_URL=http://+:18889 \ | ||
DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL=http://+:18890 | ||
|
||
ENTRYPOINT [ "dotnet", "/app/Aspire.Dashboard.dll" ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.