Skip to content

Commit 502c56a

Browse files
wiktorklbussell
wiktork
and
lbussell
committed
Use downloaded sha for dotnet-monitor (#6634)
Co-authored-by: Logan Bussell <[email protected]>
1 parent 036395e commit 502c56a

File tree

31 files changed

+208
-75
lines changed

31 files changed

+208
-75
lines changed

‎eng/dockerfile-templates/monitor-base/Dockerfile.linux‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,41 @@
33
set dotnetMajor to split(PRODUCT_VERSION, ".")[0] ^
44
set dotnetMajorMinor to cat(dotnetMajor, ".0") ^
55
set monitorMajor to split(PRODUCT_VERSION, ".")[0] ^
6+
set monitorMajorMinor to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
7+
set buildVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|build-version")] ^
8+
set monitorVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^
9+
set monitorVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|", monitorVersionVariable)] ^
10+
set versionFolder to when(buildVersion != monitorVersion, buildVersion, '$dotnet_monitor_version') ^
11+
set monitorBaseUrl to cat(VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|", VARIABLES["branch"])], "/diagnostics/monitor/", versionFolder, "/") ^
12+
set monitorBaseChecksumUrl to cat(VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|checksums|", VARIABLES["branch"])], "/diagnostics/monitor/", versionFolder, "/") ^
613
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >=0 ^
714
set aspnetBaseTag to
815
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
916
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
17+
set isInternal to find(monitorBaseUrl, "dotnetstage") >= 0 ^
1018
set installerImageTag to when(isAzureLinux,
1119
cat("mcr.microsoft.com/"
1220
when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"),
1321
"/base/core:",
1422
OS_VERSION_NUMBER),
15-
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl"))
23+
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^
24+
set monitorBaseTemplate to when(monitorMajor != "8" && monitorMajor != "9", "Dockerfile.linux.install-monitor-base.10", "Dockerfile.linux.install-monitor-base")
1625
}}ARG REPO=mcr.microsoft.com/dotnet/aspnet
1726

1827
# Installer image
1928
FROM {{installerImageTag}} AS installer
20-
{{if isAzureLinux:
29+
{{if isInternal:
30+
ARG ACCESSTOKEN
31+
}}{{if isAzureLinux:
2132
{{InsertTemplate("../Dockerfile.linux.distroless-azurelinux-installer-prereqs")}}
2233
}}
2334
# Retrieve .NET Monitor Base
24-
{{InsertTemplate("Dockerfile.linux.install-monitor-base")}}
35+
{{InsertTemplate(monitorBaseTemplate, [
36+
"monitorVersion": monitorVersion,
37+
"monitorMajorMinor": monitorMajorMinor,
38+
"monitorBaseUrl": monitorBaseUrl,
39+
"monitorBaseChecksumUrl": monitorBaseChecksumUrl
40+
])}}
2541

2642

2743
# .NET Monitor Base image

‎eng/dockerfile-templates/monitor-base/Dockerfile.linux.install-monitor-base‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
{{
2-
set monitorMajorMinor to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
3-
set buildVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|build-version")] ^
4-
set monitorVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^
5-
set monitorVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|", monitorVersionVariable)] ^
6-
set versionFolder to when(buildVersion != monitorVersion, buildVersion, '$dotnet_monitor_version') ^
7-
set monitorBaseUrl to cat(VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|", VARIABLES["branch"])], "/diagnostics/monitor/", versionFolder, "/")
81

9-
}}RUN dotnet_monitor_version={{monitorVersion}} \
2+
3+
RUN dotnet_monitor_version={{ARGS["monitorVersion"]}} \
104
&& {{InsertTemplate("../Dockerfile.linux.download-appliance", [
115
"product": "dotnet_monitor_base",
12-
"download-url": cat(monitorBaseUrl, "dotnet-monitor-base-$dotnet_monitor_version-linux-", ARCH_SHORT, ".tar.gz"),
6+
"download-url": cat(ARGS["monitorBaseUrl"], "dotnet-monitor-base-$dotnet_monitor_version-linux-", ARCH_SHORT, ".tar.gz"),
137
"file-name": "dotnet-monitor-base.tar.gz",
14-
"extract-to": "/app"
15-
"sha": VARIABLES[join(["monitor-base", monitorMajorMinor, "linux", ARCH_SHORT, "sha"], "|")],
8+
"extract-to": "/app",
9+
"sha": VARIABLES[join(["monitor-base", ARGS["monitorMajorMinor"], "linux", ARCH_SHORT, "sha"], "|")]
1610
], " ")}}

‎eng/dockerfile-templates/monitor-base/Dockerfile.linux.install-monitor-base.10‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
RUN dotnet_monitor_version={{ARGS["monitorVersion"]}} \
3+
&& {{InsertTemplate("../Dockerfile.linux.download-appliance", [
4+
"product": "dotnet_monitor_base",
5+
"download-url": cat(ARGS["monitorBaseUrl"], "dotnet-monitor-base-$dotnet_monitor_version-linux-", ARCH_SHORT, ".tar.gz"),
6+
"file-name": cat("dotnet-monitor-base-$dotnet_monitor_version-linux-", ARCH_SHORT, ".tar.gz"),
7+
"extract-to": "/app",
8+
"sha-url": cat(ARGS["monitorBaseChecksumUrl"], "dotnet-monitor-base-$dotnet_monitor_version-linux-", ARCH_SHORT, ".tar.gz.sha512"),
9+
"sha-url-is-bare": "true"
10+
], " ")}}

‎eng/dockerfile-templates/monitor/Dockerfile.linux‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
{{
22
set monitorMajor to split(PRODUCT_VERSION, ".")[0] ^
33
set monitorMajorMinor to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
4+
set buildVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|build-version")] ^
5+
set monitorVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^
6+
set monitorVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|", monitorVersionVariable)] ^
7+
set versionFolder to when(buildVersion != monitorVersion, buildVersion, '$dotnet_monitor_extension_version') ^
8+
set monitorBaseUrl to cat(VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|", VARIABLES["branch"])], "/diagnostics/monitor/", versionFolder, "/") ^
9+
set monitorBaseChecksumUrl to cat(VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|checksums|", VARIABLES["branch"])], "/diagnostics/monitor/", versionFolder, "/") ^
410
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >=0 ^
511
set monitorBaseTagOs to when(isAzureLinux,
612
cat(when(find(OS_VERSION, "3.0") >= 0, "azurelinux-distroless", "cbl-mariner-distroless")),
@@ -10,21 +16,30 @@
1016
set monitorBaseTag to
1117
cat("$REPO:", VARIABLES[cat("monitor|", monitorMajorMinor, "|product-version")], monitorBaseTagOsSuffix, ARCH_TAG_SUFFIX) ^
1218
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
19+
set isInternal to find(monitorBaseUrl, "dotnetstage") >= 0 ^
1320
set installerImageTag to when(isAzureLinux,
1421
cat("mcr.microsoft.com/"
1522
when(find(OS_VERSION, "3.0") >= 0, "azurelinux", "cbl-mariner"),
1623
"/base/core:",
1724
OS_VERSION_NUMBER),
18-
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl"))
25+
cat(ARCH_VERSIONED, "/buildpack-deps:", osVersionBase, "-curl")) ^
26+
set extensionsTemplate to when(monitorMajor != "8" && monitorMajor != "9", "Dockerfile.linux.install-extensions.10", "Dockerfile.linux.install-extensions")
1927
}}ARG REPO=mcr.microsoft.com/dotnet/monitor/base
2028

2129
# Installer image
2230
FROM {{installerImageTag}} AS installer
23-
{{if isAzureLinux:
31+
{{if isInternal:
32+
ARG ACCESSTOKEN
33+
}}{{if isAzureLinux:
2434
{{InsertTemplate("../Dockerfile.linux.distroless-azurelinux-installer-prereqs")}}
2535
}}
2636
# Retrieve .NET Monitor extensions
27-
{{InsertTemplate("Dockerfile.linux.install-extensions")}}
37+
{{InsertTemplate(extensionsTemplate, [
38+
"monitorVersion": monitorVersion,
39+
"monitorMajorMinor": monitorMajorMinor,
40+
"monitorBaseUrl": monitorBaseUrl,
41+
"monitorBaseChecksumUrl": monitorBaseChecksumUrl
42+
])}}
2843

2944

3045
# .NET Monitor image

‎eng/dockerfile-templates/monitor/Dockerfile.linux.install-extensions‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
11
{{
2-
set monitorMajorMinor to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^
3-
set buildVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|build-version")] ^
4-
set monitorVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^
5-
set monitorVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|", monitorVersionVariable)] ^
6-
set versionFolder to when(buildVersion != monitorVersion, buildVersion, '$dotnet_monitor_extension_version') ^
7-
set monitorBaseUrl to cat(VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|", VARIABLES["branch"])], "/diagnostics/monitor/", versionFolder, "/") ^
8-
92
set installDir to "/app" ^
103

114
set azBlobFileName to "dotnet-monitor-egress-azureblobstorage.tar.gz" ^
125
set s3FileName to "dotnet-monitor-egress-s3storage.tar.gz"
136

14-
}}RUN dotnet_monitor_extension_version={{monitorVersion}} \
7+
}}RUN dotnet_monitor_extension_version={{ARGS["monitorVersion"]}} \
158
&& {{InsertTemplate("../Dockerfile.linux.download-files", [
169
"files": [
1710
[
18-
"url": cat(monitorBaseUrl, "dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-", ARCH_SHORT, ".tar.gz"),
11+
"url": cat(ARGS["monitorBaseUrl"], "dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-", ARCH_SHORT, ".tar.gz"),
1912
"out-file": azBlobFileName
2013
],
2114
[
22-
"url": cat(monitorBaseUrl, "dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-", ARCH_SHORT, ".tar.gz"),
15+
"url": cat(ARGS["monitorBaseUrl"], "dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-", ARCH_SHORT, ".tar.gz"),
2316
"out-file": s3FileName
2417
]
2518
]
2619
], " ")}} \
2720
&& {{InsertTemplate("../Dockerfile.linux.validate-checksum", [
2821
"file": azBlobFileName,
29-
"sha": VARIABLES[join(["monitor-ext-azureblobstorage", monitorMajorMinor, "linux", ARCH_SHORT, "sha"], "|")],
22+
"sha": VARIABLES[join(["monitor-ext-azureblobstorage", ARGS["monitorMajorMinor"], "linux", ARCH_SHORT, "sha"], "|")],
3023
"sha-var-name": "dotnet_monitor_azureblobstorage_sha512",
3124
"sha-function": "512"
3225
], " ")}} \
3326
&& {{InsertTemplate("../Dockerfile.linux.validate-checksum", [
3427
"file": s3FileName,
35-
"sha": VARIABLES[join(["monitor-ext-s3storage", monitorMajorMinor, "linux", ARCH_SHORT, "sha"], "|")],
28+
"sha": VARIABLES[join(["monitor-ext-s3storage", ARGS["monitorMajorMinor"], "linux", ARCH_SHORT, "sha"], "|")],
3629
"sha-var-name": "dotnet_monitor_s3storage_sha512",
3730
"sha-function": "512"
3831
], " ")}} \

‎eng/dockerfile-templates/monitor/Dockerfile.linux.install-extensions.10‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{{
2+
set installDir to "/app" ^
3+
4+
set azBlobFileName to "dotnet-monitor-egress-azureblobstorage.tar.gz" ^
5+
set s3FileName to "dotnet-monitor-egress-s3storage.tar.gz" ^
6+
set azBlobShaUrl to cat(ARGS["monitorBaseChecksumUrl"], "dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-", ARCH_SHORT, ".tar.gz.sha512") ^
7+
set s3ShaUrl to cat(ARGS["monitorBaseChecksumUrl"], "dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-", ARCH_SHORT, ".tar.gz.sha512")
8+
9+
}}RUN dotnet_monitor_extension_version={{ARGS["monitorVersion"]}} \
10+
&& {{InsertTemplate("../Dockerfile.linux.download-files", [
11+
"files": [
12+
[
13+
"url": cat(ARGS["monitorBaseUrl"], "dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-", ARCH_SHORT, ".tar.gz"),
14+
"out-file": azBlobFileName
15+
],
16+
[
17+
"url": cat(ARGS["monitorBaseUrl"], "dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-", ARCH_SHORT, ".tar.gz"),
18+
"out-file": s3FileName
19+
],
20+
[
21+
"url": azBlobShaUrl,
22+
"out-file": cat(azBlobFileName, ".sha512")
23+
],
24+
[
25+
"url": s3ShaUrl,
26+
"out-file": cat(s3FileName, ".sha512")
27+
]
28+
]
29+
], " ")}} \
30+
&& {{InsertTemplate("../Dockerfile.linux.validate-checksum", [
31+
"file": azBlobFileName,
32+
"sha-file": cat(azBlobFileName, ".sha512"),
33+
"sha-file-is-bare": "true",
34+
"sha-function": "512"
35+
], " ")}} \
36+
&& {{InsertTemplate("../Dockerfile.linux.validate-checksum", [
37+
"file": s3FileName,
38+
"sha-file": cat(s3FileName, ".sha512"),
39+
"sha-file-is-bare": "true",
40+
"sha-function": "512"
41+
], " ")}} \
42+
&& mkdir --parents {{installDir}} \
43+
&& {{InsertTemplate("../Dockerfile.linux.extract-file", [
44+
"file": azBlobFileName,
45+
"dest-dir": installDir,
46+
"extract-paths": ARGS["extract-paths"]
47+
], " ")}} \
48+
&& {{InsertTemplate("../Dockerfile.linux.extract-file", [
49+
"file": s3FileName,
50+
"dest-dir": installDir,
51+
"extract-paths": ARGS["extract-paths"]
52+
], " ")}} \
53+
&& rm \
54+
{{azBlobFileName}} \
55+
{{s3FileName}} \
56+
{{cat(azBlobFileName, ".sha512")}} \
57+
{{cat(s3FileName, ".sha512")}}

‎manifest.versions.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,8 @@
159159
"monitor|10.0|minor-tag": "10.0-preview",
160160
"monitor|10.0|base-url|main": "$(base-url|public|maintenance|main)",
161161
"monitor|10.0|base-url|nightly": "$(base-url|public|preview|nightly)",
162-
"monitor-base|10.0|linux|x64|sha": "6e1d775d1e8afddbb59eb6884b19d674fa3fdf72aba408aaa495a6d9de8ed7cb7d8918d23b6368122e359011fa96bd0232bf008ad1819c1c825647e685bc20df",
163-
"monitor-base|10.0|linux|arm64|sha": "f3e45179812139166a81abe479eddb0989513b9605525ebcea6ef416aa88935d1ca1add8cba41bcf20a3cdd87989b5791811b83251c6f9e7eecbdd8f82ed30c7",
164-
"monitor-ext-azureblobstorage|10.0|linux|x64|sha": "e227eae3ab9f4a37101b0fcd6557febb2bbc76b4d11c542fd6bbbf8ca7c3ca7a34362f68c9e1f5b4ac111af68bfb38e10745b577b2d74865035868da35e1de26",
165-
"monitor-ext-azureblobstorage|10.0|linux|arm64|sha": "49c6b97a831886ecd1beb0e6c47acf8409a519dfdaae520eab19094ca0b6130bc1a8fdfe0fafe8e8987481f6ed599a2bf0e3cfb0db1c2306a5d229536efa03c6",
166-
"monitor-ext-s3storage|10.0|linux|x64|sha": "a9745d615cedc0914910428e74fa23c52bb51482646bc1110f28f6288b2623e837b59d20314027f0d2dfe7fb2b5dd41b98f0f66fa8ce7e580b617cb3c49f0b6f",
167-
"monitor-ext-s3storage|10.0|linux|arm64|sha": "43e7e6d06d97439823b7e0cf78f726cb372dca57d42dc9dda63f15f3d5017b81d8ecc2b580ea76179faeb2f5569516f895a4358a9338f6d25bdd5b763c4fee2c",
162+
"monitor|10.0|base-url|checksums|main": "$(base-url|public-checksums|preview|nightly)",
163+
"monitor|10.0|base-url|checksums|nightly": "$(base-url|public-checksums|preview|nightly)",
168164

169165
"powershell|8.0|build-version": "7.4.12",
170166
"powershell|8.0|Linux.Alpine|sha": "9e94cf561e620f7565defab65df84fdaebfe5727466bb66b2aed083f0211be78ebfe6ce4d9d2450ad5fbefc9b021096bcfbb461e86db7d588d2b607c47372ab0",

‎src/monitor-base/10.0/azurelinux-distroless/amd64/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ RUN tdnf install -y \
1111

1212
# Retrieve .NET Monitor Base
1313
RUN dotnet_monitor_version=10.0.0-rc.1.25453.1 \
14-
&& curl --fail --show-error --location --output dotnet-monitor-base.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
15-
&& dotnet_monitor_base_sha512='6e1d775d1e8afddbb59eb6884b19d674fa3fdf72aba408aaa495a6d9de8ed7cb7d8918d23b6368122e359011fa96bd0232bf008ad1819c1c825647e685bc20df' \
16-
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
14+
&& curl --fail --show-error --location --output dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz \
15+
&& sha512sum -c \
1716
&& mkdir --parents /app \
18-
&& tar --gzip --extract --no-same-owner --file dotnet-monitor-base.tar.gz --directory /app \
19-
&& rm dotnet-monitor-base.tar.gz
17+
&& tar --gzip --extract --no-same-owner --file dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz --directory /app \
18+
&& rm dotnet-monitor-base-$dotnet_monitor_version-linux-x64.tar.gz
2019

2120

2221
# .NET Monitor Base image

‎src/monitor-base/10.0/azurelinux-distroless/arm64v8/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ RUN tdnf install -y \
1111

1212
# Retrieve .NET Monitor Base
1313
RUN dotnet_monitor_version=10.0.0-rc.1.25453.1 \
14-
&& curl --fail --show-error --location --output dotnet-monitor-base.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
15-
&& dotnet_monitor_base_sha512='f3e45179812139166a81abe479eddb0989513b9605525ebcea6ef416aa88935d1ca1add8cba41bcf20a3cdd87989b5791811b83251c6f9e7eecbdd8f82ed30c7' \
16-
&& echo "$dotnet_monitor_base_sha512 dotnet-monitor-base.tar.gz" | sha512sum -c - \
14+
&& curl --fail --show-error --location --output dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_version/dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz \
15+
&& sha512sum -c \
1716
&& mkdir --parents /app \
18-
&& tar --gzip --extract --no-same-owner --file dotnet-monitor-base.tar.gz --directory /app \
19-
&& rm dotnet-monitor-base.tar.gz
17+
&& tar --gzip --extract --no-same-owner --file dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz --directory /app \
18+
&& rm dotnet-monitor-base-$dotnet_monitor_version-linux-arm64.tar.gz
2019

2120

2221
# .NET Monitor Base image

‎src/monitor/10.0/azurelinux-distroless/amd64/Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,18 @@ RUN dotnet_monitor_extension_version=10.0.0-rc.1.25453.1 \
1414
&& curl --fail --show-error --location \
1515
--output dotnet-monitor-egress-azureblobstorage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
1616
--output dotnet-monitor-egress-s3storage.tar.gz https://builds.dotnet.microsoft.com/dotnet/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz \
17-
&& dotnet_monitor_azureblobstorage_sha512='e227eae3ab9f4a37101b0fcd6557febb2bbc76b4d11c542fd6bbbf8ca7c3ca7a34362f68c9e1f5b4ac111af68bfb38e10745b577b2d74865035868da35e1de26' \
18-
&& echo "$dotnet_monitor_azureblobstorage_sha512 dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
19-
&& dotnet_monitor_s3storage_sha512='a9745d615cedc0914910428e74fa23c52bb51482646bc1110f28f6288b2623e837b59d20314027f0d2dfe7fb2b5dd41b98f0f66fa8ce7e580b617cb3c49f0b6f' \
20-
&& echo "$dotnet_monitor_s3storage_sha512 dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
17+
--output dotnet-monitor-egress-azureblobstorage.tar.gz.sha512 https://ci.dot.net/public-checksums/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-azureblobstorage-$dotnet_monitor_extension_version-linux-x64.tar.gz.sha512 \
18+
--output dotnet-monitor-egress-s3storage.tar.gz.sha512 https://ci.dot.net/public-checksums/diagnostics/monitor/$dotnet_monitor_extension_version/dotnet-monitor-egress-s3storage-$dotnet_monitor_extension_version-linux-x64.tar.gz.sha512 \
19+
&& echo "$(cat dotnet-monitor-egress-azureblobstorage.tar.gz.sha512) dotnet-monitor-egress-azureblobstorage.tar.gz" | sha512sum -c - \
20+
&& echo "$(cat dotnet-monitor-egress-s3storage.tar.gz.sha512) dotnet-monitor-egress-s3storage.tar.gz" | sha512sum -c - \
2121
&& mkdir --parents /app \
2222
&& tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-azureblobstorage.tar.gz --directory /app \
2323
&& tar --gzip --extract --no-same-owner --file dotnet-monitor-egress-s3storage.tar.gz --directory /app \
2424
&& rm \
2525
dotnet-monitor-egress-azureblobstorage.tar.gz \
26-
dotnet-monitor-egress-s3storage.tar.gz
26+
dotnet-monitor-egress-s3storage.tar.gz \
27+
dotnet-monitor-egress-azureblobstorage.tar.gz.sha512 \
28+
dotnet-monitor-egress-s3storage.tar.gz.sha512
2729

2830

2931
# .NET Monitor image

0 commit comments

Comments
 (0)