Skip to content

Commit

Permalink
Merge branch 'nightly' into nightly-UpdateDependencies-nightly-From-d…
Browse files Browse the repository at this point in the history
…otnet-sdk
  • Loading branch information
lbussell authored Oct 21, 2024
2 parents 4032307 + 238cfd6 commit a7bf361
Show file tree
Hide file tree
Showing 30 changed files with 355 additions and 156 deletions.
2 changes: 1 addition & 1 deletion .portal-docs/docker-hub/README.aspire-dashboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Featured Tags

* `8.2`
* `9.0`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:8.2`

# About
Expand Down
2 changes: 1 addition & 1 deletion .portal-docs/mar/README.aspire-dashboard.portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori

## Featured Tags

* `8.2`
* `9.0`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:8.2`

## Related Repositories
Expand Down
8 changes: 5 additions & 3 deletions README.aspire-dashboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
## Featured Tags

* `8.2`
* `9.0`
* `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:8.2`

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

Tags | Dockerfile | OS Version
-----------| -------------| -------------
8.2.1, 8.2, 8, latest | [Dockerfile](src/aspire-dashboard/8.2/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
8.2.1, 8.2, 8 | [Dockerfile](src/aspire-dashboard/8.2/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0
9.0.0-preview.4, 9.0-preview, 9-preview, latest | [Dockerfile](src/aspire-dashboard/9.0/cbl-mariner-distroless/amd64/Dockerfile) | CBL-Mariner 2.0

### Linux arm64 Tags

Tags | Dockerfile | OS Version
-----------| -------------| -------------
8.2.1, 8.2, 8, latest | [Dockerfile](src/aspire-dashboard/8.2/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
8.2.1, 8.2, 8 | [Dockerfile](src/aspire-dashboard/8.2/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.0
9.0.0-preview.4, 9.0-preview, 9-preview, latest | [Dockerfile](src/aspire-dashboard/9.0/cbl-mariner-distroless/arm64v8/Dockerfile) | CBL-Mariner 2.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
4 changes: 2 additions & 2 deletions build-and-test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ param(
[string]$Mode = "BuildAndTest",

# Categories of tests to run
[ValidateSet("runtime", "runtime-deps", "aspnet", "sdk", "pre-build", "sample", "image-size", "monitor")]
[string[]]$TestCategories = @("runtime", "runtime-deps", "aspnet", "sdk", "pre-build", "sample", "image-size", "monitor")
[ValidateSet("runtime", "runtime-deps", "aspnet", "sdk", "pre-build", "sample", "image-size", "monitor", "aspire-dashboard")]
[string[]]$TestCategories = @("runtime", "runtime-deps", "aspnet", "sdk", "pre-build", "sample", "image-size", "monitor", "aspire-dashboard")
)

if ($Version -notmatch '^\d+\.\d+(\.[\d*])?|\*$') {
Expand Down
11 changes: 8 additions & 3 deletions eng/dockerfile-templates/aspire-dashboard/Dockerfile.envs
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}}
2 changes: 1 addition & 1 deletion eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set dotnetMajorMinor to cat(dotnetMajor, ".0") ^
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >= 0 ^
set aspnetBaseTag to
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, "-extra", ARCH_TAG_SUFFIX) ^
cat("$REPO:", VARIABLES[cat("dotnet|8.0|product-version")], "-", OS_VERSION, "-extra", ARCH_TAG_SUFFIX) ^
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
set installerImageTag to when(isAzureLinux,
cat("mcr.microsoft.com/",
Expand Down
2 changes: 2 additions & 0 deletions eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml
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)
2 changes: 1 addition & 1 deletion eng/readme-templates/FeaturedTags.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ elif match(REPO, "monitor/base"):* `9` (Release Candidate)
* `docker pull {{FULL_REPO}}:9`
* `8` (Long-Term Support)
* `docker pull {{FULL_REPO}}:8`^
elif match(REPO, "aspire-dashboard"):* `8.2`
elif match(REPO, "aspire-dashboard"):* `9.0`
* `docker pull {{FULL_REPO}}:8.2`^
else:* `9.0` (Release Candidate)
* `docker pull {{FULL_REPO}}:9.0`
Expand Down
56 changes: 54 additions & 2 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -9538,8 +9538,7 @@
"sharedTags": {
"$(aspire-dashboard|8.2|fixed-tag)": {},
"$(aspire-dashboard|8.2|minor-tag)": {},
"$(aspire-dashboard|8|major-tag)": {},
"latest": {}
"$(aspire-dashboard|8|major-tag)": {}
},
"platforms": [
{
Expand Down Expand Up @@ -9585,6 +9584,59 @@
"variant": "v8"
}
]
},
{
"productVersion": "$(aspire-dashboard|9.0|product-version)",
"sharedTags": {
"$(aspire-dashboard|9.0|fixed-tag)": {},
"$(aspire-dashboard|9.0|minor-tag)": {},
"$(aspire-dashboard|9|major-tag)": {},
"latest": {}
},
"platforms": [
{
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/aspire-dashboard/9.0/cbl-mariner-distroless/amd64",
"dockerfileTemplate": "eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux",
"os": "linux",
"osVersion": "cbl-mariner2.0-distroless",
"tags": {
"$(aspire-dashboard|9.0|fixed-tag)-amd64": {
"docType": "Undocumented"
},
"$(aspire-dashboard|9.0|minor-tag)-amd64": {
"docType": "Undocumented"
},
"$(aspire-dashboard|9|major-tag)-amd64": {
"docType": "Undocumented"
}
}
},
{
"architecture": "arm64",
"buildArgs": {
"REPO": "$(Repo:aspnet)"
},
"dockerfile": "src/aspire-dashboard/9.0/cbl-mariner-distroless/arm64v8",
"dockerfileTemplate": "eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux",
"os": "linux",
"osVersion": "cbl-mariner2.0-distroless",
"tags": {
"$(aspire-dashboard|9.0|fixed-tag)-arm64v8": {
"docType": "Undocumented"
},
"$(aspire-dashboard|9.0|minor-tag)-arm64v8": {
"docType": "Undocumented"
},
"$(aspire-dashboard|9|major-tag)-arm64v8": {
"docType": "Undocumented"
}
},
"variant": "v8"
}
]
}
]
}
Expand Down
40 changes: 25 additions & 15 deletions manifest.versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
"aspire-dashboard|8.2|base-url|main": "$(base-url|public|preview|nightly)",
"aspire-dashboard|8.2|base-url|nightly": "$(base-url|public|preview|nightly)",

"aspire-dashboard|9.0|build-version": "9.0.0-preview.4.24511.1",
"aspire-dashboard|9.0|product-version": "9.0.0-preview.4",
"aspire-dashboard|9.0|fixed-tag": "$(aspire-dashboard|9.0|product-version)",
"aspire-dashboard|9.0|minor-tag": "9.0-preview",
"aspire-dashboard|9|major-tag": "9-preview",
"aspire-dashboard|9.0|linux|x64|sha": "d53df2c93730ff2fb6ebc16f5f7054352048fba31d77b887c60e6a6f48198017638fa69083a64eb0583ae68be5342be776b14de6442423f7d3511e4d5897dbea",
"aspire-dashboard|9.0|linux|arm64|sha": "aedcc1170afeb9130aad3bb73b383ff58bee63b69019c03732c46df10396725f513bb79d8da33db3eab909a232fba808b3ed3ce6aa025270ba4813136d1954e4",
"aspire-dashboard|9.0|base-url|main": "$(base-url|public|preview|nightly)",
"aspire-dashboard|9.0|base-url|nightly": "$(base-url|public|preview|nightly)",

"aspnet|6.0|build-version": "6.0.35",
"aspnet|6.0|targeting-pack-version": "$(aspnet|6.0|build-version)",
"aspnet|6.0|linux-musl|x64|sha": "50210ced90d17ea8370fbbcade3fbfb9be92690faea77d5516dc8ade4eee83408b2d37f812cca020087441d2f3146507086792cff17f7413308eb12fa4abd66d",
Expand Down Expand Up @@ -151,32 +161,32 @@
"monitor-ext-s3storage|8.0|linux|x64|sha": "d0a52ec50ffdbbe68148cc31b68607813dfb9d0132ea92470b5e2329bf3588c03690d4b80db47c7e370a36769ebc0fb2fa600d44f3a9bb6688e00a50bdae8b88",
"monitor-ext-s3storage|8.0|linux|arm64|sha": "5b4e1e03aeb2232e10a382547bd97c59362bba61961215a7a58208d72b03966d34aa5449c587f414d6ea93b96f2c1b937540f5751e4f53b653dda50c56118483",

"monitor|8.1|build-version": "8.1.0-alpha.1.24515.9",
"monitor|8.1|build-version": "8.1.0-alpha.1.24516.5",
"monitor|8.1|product-version": "8.1.0-alpha.1",
"monitor|8.1|fixed-tag": "$(monitor|8.1|product-version)",
"monitor|8.1|minor-tag": "8.1-preview",
"monitor|8.1|base-url|main": "$(base-url|public|preview|main)",
"monitor|8.1|base-url|nightly": "$(base-url|public|preview|nightly)",
"monitor-base|8.1|linux|x64|sha": "8a348951ec5519b9d802eaf45d1bdaaa8a65cb72aa88e3dc98a9d975e6419385154276f18e1dd3cdded711a76fd3f3c78e20c72fbf90dfff2515cb439f3c5819",
"monitor-base|8.1|linux|arm64|sha": "18596bcd9b40fa5e0744f9795617dd19bad83b6956cbcb6f266c6b914788f39ee411632a4d18ddc78ca56e3b720804f78af3c2af02e8522de4a8243d137e9dfc",
"monitor-ext-azureblobstorage|8.1|linux|x64|sha": "563a4bac0046d18b651733a85eeda7423becfd916763c54dd97e1a41d50ae6a7fed3b5efe3627b93ceb1c549e8257d0cf2ccda411bb958f123cf70004717667e",
"monitor-ext-azureblobstorage|8.1|linux|arm64|sha": "7e7c01515b9d15421efd28c40dbf101d34e54053faafb35a79d12f72d47c625753fd1cf662ba675ff4970813ef535576fe31fc149cea165c632d59090f33ebbf",
"monitor-ext-s3storage|8.1|linux|x64|sha": "a529339b0cb0633928cd5b7c750b37f9a1efc374632e23fccbf3855c1cc9b16847cea1d81f18337f66dfa03f5812bb925a1a7b26171746ac3005f7a806dfc697",
"monitor-ext-s3storage|8.1|linux|arm64|sha": "22ae27b9afec6e54462c306fc6d9c7b9e0ab21ffb198a837258e8ecb64de9407fc84054a7c94b1d593acca847c57717657d5c7a124dda3a83bef4bf4cd008f7e",

"monitor|9.0|build-version": "9.0.0-rtm.24515.8",
"monitor-base|8.1|linux|x64|sha": "448b8b21b1e0a6ae07552365911eb2e5b56696187401151a19b7322cbad0f194769c08df38ee0926febfb4b2d3fe4e0ba77f4edbaac989fc72a2e5ca688a4a96",
"monitor-base|8.1|linux|arm64|sha": "ddb83edd905f0716bf02b8db81e20afa07e04bf509646d5df11f6594a9bbd2771dd04010543838c7acdcde2fe4f24f749680bcf8d2ec50567aca4d5370088666",
"monitor-ext-azureblobstorage|8.1|linux|x64|sha": "0cca9dd3dd2894fd9f929ddacce42fa09b05bd52541d114de45dcc1abe7a5cdcca77afa905344e0731340a97cefd90fa66d63a6807e5969edb1efae2aee2f438",
"monitor-ext-azureblobstorage|8.1|linux|arm64|sha": "123a42baabcfecbea340ebae5c2c1b6fbf35efe181cbec94daf88a0931275485db6c009f2bd3f809e0e572071713059d62148c37a0bfe21efc0dd03618dab1ec",
"monitor-ext-s3storage|8.1|linux|x64|sha": "f678720e662e6d172ce673a02be8d1c696bf86ab688a4a0d21c95c98596b72449b359e0cc0f06265381cc012179c713c75eca1e37d70bad4607538a297e0057e",
"monitor-ext-s3storage|8.1|linux|arm64|sha": "563b7ffdb013b1ec8ce45de1828def382423005d3d19ea1ddd05c3ebb70d7011b04acf516fd9e7df22a2558fc369746da452a6e5e43dda80e3be2c1527b78ae8",

"monitor|9.0|build-version": "9.0.0-rtm.24520.4",
"monitor|9.0|product-version": "9.0.0",
"monitor|9.0|fixed-tag": "$(monitor|9.0|product-version)",
"monitor|9.0|minor-tag": "9.0",
"monitor|9|major-tag": "9",
"monitor|9.0|base-url|main": "$(base-url|public|preview|main)",
"monitor|9.0|base-url|nightly": "$(base-url|public|preview|nightly)",
"monitor-base|9.0|linux|x64|sha": "ca49e1c5c5060a31f677cec0d6a1ae9c0eab207ab5401fffec3c72c24129c5588b217ed0432b9c8321d9eec07be1950bd89f97b4c96eddb7887d6133a02ab701",
"monitor-base|9.0|linux|arm64|sha": "a003529bdb1d2cba2f79eefdd34090bbb45989f2c7c177a183ce60b755833a82b8f5d54f95fc828ea208d5b1daca786ace175eadf58e68552d3b51c8f3f1cb91",
"monitor-ext-azureblobstorage|9.0|linux|x64|sha": "48cab3930fe96b5e603b2d34b5d650c30a69b51aaa13ea144fd075b9b42c46085e63567e7352ceec916687748f16c05f3d3708cbcdce6a063e1e0d0f3ffa93ba",
"monitor-ext-azureblobstorage|9.0|linux|arm64|sha": "4e7c50071e88b2ffa1778c41e513fe4b025ccaf194321cb23f8affe144e9b49ac79aa5304ef71fa596f980f48a3887fcfaf24183602134fd894fb54223db0133",
"monitor-ext-s3storage|9.0|linux|x64|sha": "62e6a4acc4c5c5014c21c8013ad6f92b5c85b1c8d76bdae55e26544ac4a35ce22b6cda216f3a7510376f9106d903c80b1e6017e1bb0dfec70ce57fd9b9005088",
"monitor-ext-s3storage|9.0|linux|arm64|sha": "f116ad2d66784a7d9be97eeaa13d7109047f9c37a89f15f2b3332c427b22fc18f48b40c483bed2a329d989a6435ffbe49a4faefa717b27071bd13bcd47a435c4",
"monitor-base|9.0|linux|x64|sha": "fdc1d96511f7119ec0af62c4b6ccfba264ad6f5a868a54599bba3293feeda22dafa3c89cf63715862ae21def54c68c549ee99ae7ced2c7b20fffa30619bd9c45",
"monitor-base|9.0|linux|arm64|sha": "7a28362648e895028042f36aef21d074f1cc7cce6e2cdffe62eac1b1151be44042ee3b70897e8d08b6ba6cfd3d1c80488e7db7c49709695dc4bdb5c64946bcef",
"monitor-ext-azureblobstorage|9.0|linux|x64|sha": "901d378c17a3f99f8256938c2f3ec35a71ec1723755e95d9ccff34342d3b5d78b738752ce54248e522d654217a1034c22f5367a9c0c0a0e7e13ffed416f84896",
"monitor-ext-azureblobstorage|9.0|linux|arm64|sha": "f3a9bc13bbd18332fb292bad9de086e94341c8e653235a07cc23591f4a75536e0863e31a66ee2066012431944376e1971f7a06286f8ff8731ea9fc4b891ebfb6",
"monitor-ext-s3storage|9.0|linux|x64|sha": "961767d4bf4e2dfa711ad9c897923e7a96396af6cce013eaec6b33109d0256c3f49a98c06eade6143c7f5ce6ff0542691961724049175a2793d096b6a8a7141c",
"monitor-ext-s3storage|9.0|linux|arm64|sha": "b2bc5fef74f52e27fbd9fa72975531920898246d2287516013246b20bfbe0151fc3331f8c735ff37726c440b7efeb0d3ed8204d758476621f736a156a0c53dec",

"netstandard-targeting-pack-2.1.0|linux-rpm|x64|sha": "fab41a86b9182b276992795247868c093890c6b3d5739376374a302430229624944998e054de0ff99bddd9459fc9543636df1ebd5392db069ae953ac17ea2880",

Expand Down
35 changes: 35 additions & 0 deletions src/aspire-dashboard/9.0/cbl-mariner-distroless/amd64/Dockerfile
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 src/aspire-dashboard/9.0/cbl-mariner-distroless/arm64v8/Dockerfile
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" ]
4 changes: 2 additions & 2 deletions src/monitor-base/8.1/cbl-mariner-distroless/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve .NET Monitor Base
RUN dotnet_monitor_version=8.1.0-alpha.1.24515.9 \
RUN dotnet_monitor_version=8.1.0-alpha.1.24516.5 \
&& curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
&& dotnet_monitor_base_sha512='8a348951ec5519b9d802eaf45d1bdaaa8a65cb72aa88e3dc98a9d975e6419385154276f18e1dd3cdded711a76fd3f3c78e20c72fbf90dfff2515cb439f3c5819' \
&& dotnet_monitor_base_sha512='448b8b21b1e0a6ae07552365911eb2e5b56696187401151a19b7322cbad0f194769c08df38ee0926febfb4b2d3fe4e0ba77f4edbaac989fc72a2e5ca688a4a96' \
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-base.tar.gz -C /app \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ RUN tdnf install -y \
&& tdnf clean all

# Retrieve .NET Monitor Base
RUN dotnet_monitor_version=8.1.0-alpha.1.24515.9 \
RUN dotnet_monitor_version=8.1.0-alpha.1.24516.5 \
&& curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
&& dotnet_monitor_base_sha512='18596bcd9b40fa5e0744f9795617dd19bad83b6956cbcb6f266c6b914788f39ee411632a4d18ddc78ca56e3b720804f78af3c2af02e8522de4a8243d137e9dfc' \
&& dotnet_monitor_base_sha512='ddb83edd905f0716bf02b8db81e20afa07e04bf509646d5df11f6594a9bbd2771dd04010543838c7acdcde2fe4f24f749680bcf8d2ec50567aca4d5370088666' \
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-base.tar.gz -C /app \
Expand Down
4 changes: 2 additions & 2 deletions src/monitor-base/8.1/ubuntu-chiseled/amd64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
FROM amd64/buildpack-deps:jammy-curl AS installer

# Retrieve .NET Monitor Base
RUN dotnet_monitor_version=8.1.0-alpha.1.24515.9 \
RUN dotnet_monitor_version=8.1.0-alpha.1.24516.5 \
&& curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
&& dotnet_monitor_base_sha512='8a348951ec5519b9d802eaf45d1bdaaa8a65cb72aa88e3dc98a9d975e6419385154276f18e1dd3cdded711a76fd3f3c78e20c72fbf90dfff2515cb439f3c5819' \
&& dotnet_monitor_base_sha512='448b8b21b1e0a6ae07552365911eb2e5b56696187401151a19b7322cbad0f194769c08df38ee0926febfb4b2d3fe4e0ba77f4edbaac989fc72a2e5ca688a4a96' \
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-base.tar.gz -C /app \
Expand Down
4 changes: 2 additions & 2 deletions src/monitor-base/8.1/ubuntu-chiseled/arm64v8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet
FROM arm64v8/buildpack-deps:jammy-curl AS installer

# Retrieve .NET Monitor Base
RUN dotnet_monitor_version=8.1.0-alpha.1.24515.9 \
RUN dotnet_monitor_version=8.1.0-alpha.1.24516.5 \
&& curl -fSL --output dotnet-monitor-base.tar.gz https://dotnetbuilds.azureedge.net/public/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
&& dotnet_monitor_base_sha512='18596bcd9b40fa5e0744f9795617dd19bad83b6956cbcb6f266c6b914788f39ee411632a4d18ddc78ca56e3b720804f78af3c2af02e8522de4a8243d137e9dfc' \
&& dotnet_monitor_base_sha512='ddb83edd905f0716bf02b8db81e20afa07e04bf509646d5df11f6594a9bbd2771dd04010543838c7acdcde2fe4f24f749680bcf8d2ec50567aca4d5370088666' \
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
&& mkdir -p /app \
&& tar -oxzf dotnet-monitor-base.tar.gz -C /app \
Expand Down
Loading

0 comments on commit a7bf361

Please sign in to comment.