Skip to content

Commit 0c23ecb

Browse files
dotnet-docker-botdotnet-docker-bot
committed
[nightly] Update dependencies from chisel
1 parent f0273d5 commit 0c23ecb

23 files changed

Lines changed: 68 additions & 43 deletions

File tree

‎eng/common/templates/variables/docker-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2817852
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2830238
33
imageNames.imageBuilder: $(imageNames.imageBuilderName)
44
imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId)
55
imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner

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

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,25 @@
88
set monitorVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^
99
set monitorVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|", monitorVersionVariable)] ^
1010
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, "/") ^
11+
12+
_ This logic is duplicated in eng/dockerfile-templates/monitor/Dockerfile.linux ^
13+
set monitorBaseUrl to VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|", VARIABLES["branch"])] ^
14+
set monitorBaseChecksumUrl to VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|checksums|", VARIABLES["branch"])] ^
15+
set isInternal to find(monitorBaseUrl, "dotnetstage") >= 0 ^
16+
set publicMonitorPath to cat("/diagnostics/monitor/", versionFolder, "/") ^
17+
_ Internal builds of monitor have a different download path. Example internal URL:
18+
https://<staging account>.blob.core.windows.net/dotnet-monitor/<build version>/(BlobAssets|ChecksumAssets)/<file> ^
19+
_ Assume that the base URL has the dotnet-monitor part of the path on it ^
20+
set monitorPath to when(isInternal, cat("/", versionFolder, "/BlobAssets/"), publicMonitorPath) ^
21+
set monitorChecksumPath to when(isInternal, cat("/", versionFolder, "/ChecksumAssets/"), publicMonitorPath) ^
22+
23+
set monitorBaseUrl to cat(monitorBaseUrl, monitorPath) ^
24+
set monitorBaseChecksumUrl to cat(monitorBaseChecksumUrl, monitorChecksumPath) ^
25+
1326
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >=0 ^
1427
set aspnetBaseTag to
1528
cat("$REPO:", VARIABLES[cat("dotnet|", dotnetMajorMinor, "|product-version")], "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
1629
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
17-
set isInternal to find(monitorBaseUrl, "dotnetstage") >= 0 ^
1830
set installerImageTag to when(isAzureLinux,
1931
cat("mcr.microsoft.com/"
2032
when(find(OS_VERSION_NUMBER, "3.0") >= 0, "azurelinux", "cbl-mariner"),

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,22 @@
55
set monitorVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^
66
set monitorVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|", monitorVersionVariable)] ^
77
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, "/") ^
8+
9+
_ This logic is duplicated in eng/dockerfile-templates/monitor-base/Dockerfile.linux ^
10+
set monitorBaseUrl to VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|", VARIABLES["branch"])] ^
11+
set monitorBaseChecksumUrl to VARIABLES[cat("monitor|", monitorMajorMinor, "|base-url|checksums|", VARIABLES["branch"])] ^
12+
set isInternal to find(monitorBaseUrl, "dotnetstage") >= 0 ^
13+
14+
set publicMonitorPath to cat("/diagnostics/monitor/", versionFolder, "/") ^
15+
_ Internal builds of monitor have a different download path. Example internal URL:
16+
https://<staging account>.blob.core.windows.net/dotnet-monitor/<build version>/(BlobAssets|ChecksumAssets)/<file> ^
17+
_ Assume that the base URL has the dotnet-monitor part of the path on it ^
18+
set monitorPath to when(isInternal, cat("/", versionFolder, "/BlobAssets/"), publicMonitorPath) ^
19+
set monitorChecksumPath to when(isInternal, cat("/", versionFolder, "/ChecksumAssets/"), publicMonitorPath) ^
20+
21+
set monitorBaseUrl to cat(monitorBaseUrl, monitorPath) ^
22+
set monitorBaseChecksumUrl to cat(monitorBaseChecksumUrl, monitorChecksumPath) ^
23+
1024
set isAzureLinux to find(OS_VERSION, "mariner") >= 0 || find(OS_VERSION, "azurelinux") >=0 ^
1125
set monitorBaseTagOs to when(isAzureLinux,
1226
cat(when(find(OS_VERSION, "3.0") >= 0, "azurelinux-distroless", "cbl-mariner-distroless")),
@@ -16,7 +30,6 @@
1630
set monitorBaseTag to
1731
cat("$REPO:", VARIABLES[cat("monitor|", monitorMajorMinor, "|product-version")], monitorBaseTagOsSuffix, ARCH_TAG_SUFFIX) ^
1832
set osVersionBase to match(OS_VERSION, ".+(?=.*-)")[0] ^
19-
set isInternal to find(monitorBaseUrl, "dotnetstage") >= 0 ^
2033
set installerImageTag to when(isAzureLinux,
2134
cat("mcr.microsoft.com/"
2235
when(find(OS_VERSION, "3.0") >= 0, "azurelinux", "cbl-mariner"),

‎tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-10.0-azurelinux-distroless-amd64-Dockerfile.approved.txt‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-10.0-azurelinux-distroless-arm64v8-Dockerfile.approved.txt‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.1-azurelinux-distroless-amd64-Dockerfile.approved.txt‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.1-azurelinux-distroless-arm64v8-Dockerfile.approved.txt‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.1-ubuntu-chiseled-amd64-Dockerfile.approved.txt‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-8.1-ubuntu-chiseled-arm64v8-Dockerfile.approved.txt‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/monitor-9.0-azurelinux-distroless-amd64-Dockerfile.approved.txt‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)