Skip to content

Commit e90d72a

Browse files
[nightly] Update dependencies from syft
1 parent 17bb080 commit e90d72a

634 files changed

Lines changed: 2210 additions & 2147 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.aspnet.md

Lines changed: 117 additions & 117 deletions
Large diffs are not rendered by default.

README.runtime-deps.md

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

README.runtime.md

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

README.sdk.md

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

documentation/supported-platforms.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ This document describes the platforms (OS and architectures) supported by the of
66

77
.NET supports [a broad set of operating systems and versions](https://github.com/dotnet/core/blob/main/os-lifecycle-policy.md). When producing container images, it’s impractical to support the full matrix of OS, arch, and .NET version combinations. In practice, images are produced for a select set of operating systems and versions. If official .NET container images aren't provided for your preferred OS, [let us know by opening a discussion](https://github.com/dotnet/dotnet-docker/discussions). Alternatively, you can [author your own .NET images](scenarios/installing-dotnet.md).
88

9-
- New versions of operating systems that we support are added on a best-effort basis, typically within one month.
10-
- New OSes are always available in the [nightly repositories](https://github.com/dotnet/dotnet-docker/blob/nightly/README.md) first, and then are added to the officially supported repos afterwards.
9+
- Images for new OS versions are typically released within one month of the new OS release, with a goal to release same-day when possible.
10+
- New OS versions are available in [`dotnet/nightly` repositories](https://github.com/dotnet/dotnet-docker/blob/nightly/README.md) first, and are added to the officially supported repos afterwards.
1111
- All new OS releases will be accompanied by an [announcement](https://github.com/dotnet/dotnet-docker/discussions/categories/announcements).
1212

13+
These policies are specific to .NET container images. For more information on overall .NET OS support, see [.NET OS Support Tracking](https://github.com/dotnet/core/issues/9638).
14+
1315
### Linux
1416

1517
Each distribution (distro) has a unique approach to releasing, schedule, and end-of life (EOL). This prohibits the definition of a one-size-fits-all policy. Instead, a policy is defined for each supported distro.

eng/common/templates/jobs/publish.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,16 @@ jobs:
250250
'$(gitHubNotificationsRepoInfo.org)'
251251
'$(gitHubNotificationsRepoInfo.repo)'
252252
--repo-prefix '$(publishRepoPrefix)'
253-
--task "🟪 Copy Images (Authenticated)"
254-
--task "🟪 Publish Manifest (Authenticated)"
255-
--task "🟪 Wait for Image Ingestion (Authenticated)"
253+
--task "🟪 Copy Images"
254+
--task "🟪 Publish Manifest"
255+
--task "🟪 Wait for Image Ingestion"
256256
--task "🟪 Publish Readmes"
257-
--task "🟪 Wait for MCR Doc Ingestion (Authenticated)"
257+
--task "🟪 Wait for MCR Doc Ingestion"
258258
--task "🟪 Publish Image Info"
259-
--task "🟪 Ingest Kusto Image Info (Authenticated)"
260-
--task "🟪 Generate EOL Annotation Data (Authenticated)"
261-
--task "🟪 Annotate EOL Images (Authenticated)"
262-
--task "🟪 Wait for Annotation Ingestion (Authenticated)"
259+
--task "🟪 Ingest Kusto Image Info"
260+
--task "🟪 Generate EOL Annotation Data"
261+
--task "🟪 Annotate EOL Images"
262+
--task "🟪 Wait for Annotation Ingestion"
263263
$(dryRunArg)
264264
$(imageBuilder.commonCmdArgs)
265265
displayName: Post Publish Notification

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:2718660
2+
imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2727330
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/Dockerfile.linux.download-file

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
sha-var-name: Name of variable that stores the checksum
99
sha-function: SHA function to use ^
1010

11-
set isInternal to find(ARGS["url"], "artifacts.visualstudio.com") >= 0 ^
12-
set alpineSetTokenCmd to 'token=$(echo "${ACCESSTOKEN}:${ACCESSTOKEN}" | base64 -w 0)' ^
13-
set additionalWgetArgs to when(isInternal, '--header="Authorization: Basic $token" ', '') ^
14-
set additionalCurlArgs to when(isInternal, '-u :$ACCESSTOKEN --basic ', '') ^
11+
_ Documentation for using Managed Identity/OAuth tokens to access Azure storage accounts:
12+
https://learn.microsoft.com/en-us/rest/api/storageservices/authorize-with-azure-active-directory#call-storage-operations-with-oauth-tokens ^
13+
14+
set isInternal to find(ARGS["url"], "dotnetstage") >= 0 ^
15+
set headerArgs to when(isInternal, '--header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" ', '') ^
1516
set isAlpine to find(OS_VERSION, "alpine") >= 0 ^
1617
set shaFunction to ARGS["sha-function"] ^
1718
set shaFunction to when(shaFunction, shaFunction, "512")
18-
}}{{if isAlpine:{{if isInternal:{{alpineSetTokenCmd}} \
19-
&& }}wget {{additionalWgetArgs}}-O^else:curl {{additionalCurlArgs}}-fSL --output}} {{ARGS["out-file"]}} {{if isInternal:"{{ARGS["url"]}}"^else:{{ARGS["url"]}}}}{{if ARGS["sha"]: \
19+
}}{{if isAlpine:wget {{headerArgs}}-O^else:curl {{headerArgs}}-fSL --output}} {{ARGS["out-file"]}} {{if isInternal:"{{ARGS["url"]}}"^else:{{ARGS["url"]}}}}{{if ARGS["sha"]: \
2020
&& {{ARGS["sha-var-name"]}}='{{ARGS["sha"]}}' \
2121
&& echo "${{ARGS["sha-var-name"]}} {{ARGS["out-file"]}}" | sha{{shaFunction}}sum -c -}}

eng/dockerfile-templates/Dockerfile.windows.download-file

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@
88
sha-var-name: Name of variable that stores the checksum
99
hash-algorithm: Algorithm type to use to get the checksum. Defaults to sha512 ^
1010

11-
set isInternal to find(ARGS["url"], "artifacts.visualstudio.com") >= 0 ^
11+
_ Documentation for using Managed Identity/OAuth tokens to access Azure storage accounts:
12+
https://learn.microsoft.com/en-us/rest/api/storageservices/authorize-with-azure-active-directory#call-storage-operations-with-oauth-tokens ^
13+
14+
set isInternal to find(ARGS["url"], "dotnetstage") >= 0 ^
1215
set hashAlgorithm to when(ARGS["hash-algorithm"], ARGS["hash-algorithm"], "sha512")
1316
}}{{if isInternal:`
14-
$Base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(\":$($Env:ACCESSTOKEN)\")); `
15-
$Headers = @@{Authorization = \"Basic $Base64AuthInfo\"}; `
17+
$Headers = @@{ `
18+
Authorization = \"Bearer $env:ACCESSTOKEN\"; `
19+
'x-ms-version' = '2017-11-09'; `
20+
}; `
1621
Invoke-WebRequest -OutFile {{ARGS["out-file"]}} \"{{ARGS["url"]}}\" -Headers $Headers; `
1722
`^else:Invoke-WebRequest -OutFile {{ARGS["out-file"]}} {{ARGS["url"]}}; `}}
1823
${{ARGS["sha-var-name"]}} = '{{ARGS["sha"]}}'; `

eng/dockerfile-templates/aspnet/Dockerfile.linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
set isFullAzureLinux to isAzureLinux && !isDistroless ^
1111
set isDistrolessAzureLinux to isAzureLinux && isDistroless ^
1212
set baseUrl to VARIABLES[cat("dotnet|", dotnetVersion, "|base-url|", VARIABLES["branch"])] ^
13-
set isInternal to find(baseUrl, "artifacts.visualstudio.com") >= 0 ^
13+
set isInternal to find(baseUrl, "dotnetstage") >= 0 ^
1414
set runtimeDepsVariant to when(ARGS["is-extra"], "-extra", "") ^
1515
set tagVersion to when(dotnetVersion = "8.0",
1616
VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")],

0 commit comments

Comments
 (0)