Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into main-to-nightly-9.0…
Browse files Browse the repository at this point in the history 
….101
  • Loading branch information
@lbussell
lbussell committed Dec 4, 2024
2 parents 9a437e7 + 812265c commit 9c4bbff
Show file tree
Hide file tree
Showing 32 changed files with 90 additions and 117 deletions.
46 changes: 23 additions & 23 deletions README.sdk.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ The [Image Variants documentation](https://github.com/dotnet/dotnet-docker/blob/

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.100-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.100-bookworm-slim, 9.0-bookworm-slim, 9.0.100, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
9.0.100-alpine3.20-amd64, 9.0-alpine3.20-amd64, 9.0-alpine-amd64, 9.0.100-alpine3.20, 9.0-alpine3.20, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.20/amd64/Dockerfile) | Alpine 3.20
9.0.100-alpine3.20-aot-amd64, 9.0-alpine3.20-aot-amd64, 9.0-alpine-aot-amd64, 9.0.100-alpine3.20-aot, 9.0-alpine3.20-aot, 9.0-alpine-aot | [Dockerfile](src/sdk/9.0/alpine3.20-aot/amd64/Dockerfile) | Alpine 3.20
9.0.100-noble-amd64, 9.0-noble-amd64, 9.0.100-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
9.0.100-noble-aot-amd64, 9.0-noble-aot-amd64, 9.0.100-noble-aot, 9.0-noble-aot | [Dockerfile](src/sdk/9.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
9.0.100-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.100-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
9.0.100-azurelinux3.0-aot-amd64, 9.0-azurelinux3.0-aot-amd64, 9.0.100-azurelinux3.0-aot, 9.0-azurelinux3.0-aot | [Dockerfile](src/sdk/9.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
9.0.101-bookworm-slim-amd64, 9.0-bookworm-slim-amd64, 9.0.101-bookworm-slim, 9.0-bookworm-slim, 9.0.101, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/amd64/Dockerfile) | Debian 12
9.0.101-alpine3.20-amd64, 9.0-alpine3.20-amd64, 9.0-alpine-amd64, 9.0.101-alpine3.20, 9.0-alpine3.20, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.20/amd64/Dockerfile) | Alpine 3.20
9.0.101-alpine3.20-aot-amd64, 9.0-alpine3.20-aot-amd64, 9.0-alpine-aot-amd64, 9.0.101-alpine3.20-aot, 9.0-alpine3.20-aot, 9.0-alpine-aot | [Dockerfile](src/sdk/9.0/alpine3.20-aot/amd64/Dockerfile) | Alpine 3.20
9.0.101-noble-amd64, 9.0-noble-amd64, 9.0.101-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/amd64/Dockerfile) | Ubuntu 24.04
9.0.101-noble-aot-amd64, 9.0-noble-aot-amd64, 9.0.101-noble-aot, 9.0-noble-aot | [Dockerfile](src/sdk/9.0/noble-aot/amd64/Dockerfile) | Ubuntu 24.04
9.0.101-azurelinux3.0-amd64, 9.0-azurelinux3.0-amd64, 9.0.101-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
9.0.101-azurelinux3.0-aot-amd64, 9.0-azurelinux3.0-aot-amd64, 9.0.101-azurelinux3.0-aot, 9.0-azurelinux3.0-aot | [Dockerfile](src/sdk/9.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0
8.0.404-bookworm-slim-amd64, 8.0-bookworm-slim-amd64, 8.0.404-bookworm-slim, 8.0-bookworm-slim, 8.0.404, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/amd64/Dockerfile) | Debian 12
8.0.404-alpine3.20-amd64, 8.0-alpine3.20-amd64, 8.0-alpine-amd64, 8.0.404-alpine3.20, 8.0-alpine3.20, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.20/amd64/Dockerfile) | Alpine 3.20
8.0.404-alpine3.20-aot-amd64, 8.0-alpine3.20-aot-amd64, 8.0-alpine-aot-amd64, 8.0.404-alpine3.20-aot, 8.0-alpine3.20-aot, 8.0-alpine-aot | [Dockerfile](src/sdk/8.0/alpine3.20-aot/amd64/Dockerfile) | Alpine 3.20
Expand All @@ -92,13 +92,13 @@ Tags | Dockerfile | OS Version

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.100-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.100-bookworm-slim, 9.0-bookworm-slim, 9.0.100, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
9.0.100-alpine3.20-arm64v8, 9.0-alpine3.20-arm64v8, 9.0-alpine-arm64v8, 9.0.100-alpine3.20, 9.0-alpine3.20, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.20/arm64v8/Dockerfile) | Alpine 3.20
9.0.100-alpine3.20-aot-arm64v8, 9.0-alpine3.20-aot-arm64v8, 9.0-alpine-aot-arm64v8, 9.0.100-alpine3.20-aot, 9.0-alpine3.20-aot, 9.0-alpine-aot | [Dockerfile](src/sdk/9.0/alpine3.20-aot/arm64v8/Dockerfile) | Alpine 3.20
9.0.100-noble-arm64v8, 9.0-noble-arm64v8, 9.0.100-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
9.0.100-noble-aot-arm64v8, 9.0-noble-aot-arm64v8, 9.0.100-noble-aot, 9.0-noble-aot | [Dockerfile](src/sdk/9.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
9.0.100-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.100-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
9.0.100-azurelinux3.0-aot-arm64v8, 9.0-azurelinux3.0-aot-arm64v8, 9.0.100-azurelinux3.0-aot, 9.0-azurelinux3.0-aot | [Dockerfile](src/sdk/9.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
9.0.101-bookworm-slim-arm64v8, 9.0-bookworm-slim-arm64v8, 9.0.101-bookworm-slim, 9.0-bookworm-slim, 9.0.101, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
9.0.101-alpine3.20-arm64v8, 9.0-alpine3.20-arm64v8, 9.0-alpine-arm64v8, 9.0.101-alpine3.20, 9.0-alpine3.20, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.20/arm64v8/Dockerfile) | Alpine 3.20
9.0.101-alpine3.20-aot-arm64v8, 9.0-alpine3.20-aot-arm64v8, 9.0-alpine-aot-arm64v8, 9.0.101-alpine3.20-aot, 9.0-alpine3.20-aot, 9.0-alpine-aot | [Dockerfile](src/sdk/9.0/alpine3.20-aot/arm64v8/Dockerfile) | Alpine 3.20
9.0.101-noble-arm64v8, 9.0-noble-arm64v8, 9.0.101-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
9.0.101-noble-aot-arm64v8, 9.0-noble-aot-arm64v8, 9.0.101-noble-aot, 9.0-noble-aot | [Dockerfile](src/sdk/9.0/noble-aot/arm64v8/Dockerfile) | Ubuntu 24.04
9.0.101-azurelinux3.0-arm64v8, 9.0-azurelinux3.0-arm64v8, 9.0.101-azurelinux3.0, 9.0-azurelinux3.0 | [Dockerfile](src/sdk/9.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
9.0.101-azurelinux3.0-aot-arm64v8, 9.0-azurelinux3.0-aot-arm64v8, 9.0.101-azurelinux3.0-aot, 9.0-azurelinux3.0-aot | [Dockerfile](src/sdk/9.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0
8.0.404-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.404-bookworm-slim, 8.0-bookworm-slim, 8.0.404, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
8.0.404-alpine3.20-arm64v8, 8.0-alpine3.20-arm64v8, 8.0-alpine-arm64v8, 8.0.404-alpine3.20, 8.0-alpine3.20, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.20/arm64v8/Dockerfile) | Alpine 3.20
8.0.404-alpine3.20-aot-arm64v8, 8.0-alpine3.20-aot-arm64v8, 8.0-alpine-aot-arm64v8, 8.0.404-alpine3.20-aot, 8.0-alpine3.20-aot, 8.0-alpine-aot | [Dockerfile](src/sdk/8.0/alpine3.20-aot/arm64v8/Dockerfile) | Alpine 3.20
Expand All @@ -115,9 +115,9 @@ Tags | Dockerfile | OS Version

Tags | Dockerfile | OS Version
-----------| -------------| -------------
9.0.100-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.100-bookworm-slim, 9.0-bookworm-slim, 9.0.100, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
9.0.100-alpine3.20-arm32v7, 9.0-alpine3.20-arm32v7, 9.0-alpine-arm32v7, 9.0.100-alpine3.20, 9.0-alpine3.20, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.20/arm32v7/Dockerfile) | Alpine 3.20
9.0.100-noble-arm32v7, 9.0-noble-arm32v7, 9.0.100-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
9.0.101-bookworm-slim-arm32v7, 9.0-bookworm-slim-arm32v7, 9.0.101-bookworm-slim, 9.0-bookworm-slim, 9.0.101, 9.0, latest | [Dockerfile](src/sdk/9.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
9.0.101-alpine3.20-arm32v7, 9.0-alpine3.20-arm32v7, 9.0-alpine-arm32v7, 9.0.101-alpine3.20, 9.0-alpine3.20, 9.0-alpine | [Dockerfile](src/sdk/9.0/alpine3.20/arm32v7/Dockerfile) | Alpine 3.20
9.0.101-noble-arm32v7, 9.0-noble-arm32v7, 9.0.101-noble, 9.0-noble | [Dockerfile](src/sdk/9.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
8.0.404-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.404-bookworm-slim, 8.0-bookworm-slim, 8.0.404, 8.0 | [Dockerfile](src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
8.0.404-alpine3.20-arm32v7, 8.0-alpine3.20-arm32v7, 8.0-alpine-arm32v7, 8.0.404-alpine3.20, 8.0-alpine3.20, 8.0-alpine | [Dockerfile](src/sdk/8.0/alpine3.20/arm32v7/Dockerfile) | Alpine 3.20
8.0.404-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.404-jammy, 8.0-jammy | [Dockerfile](src/sdk/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04
Expand All @@ -126,42 +126,42 @@ Tags | Dockerfile | OS Version

Tag | Dockerfile
---------| ---------------
9.0.100-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
9.0.101-nanoserver-ltsc2025, 9.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2025/amd64/Dockerfile)
8.0.404-nanoserver-ltsc2025, 8.0-nanoserver-ltsc2025 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2025/amd64/Dockerfile)

### Windows Server Core 2025 amd64 Tags

Tag | Dockerfile
---------| ---------------
9.0.100-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
9.0.101-windowsservercore-ltsc2025, 9.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2025/amd64/Dockerfile)
8.0.404-windowsservercore-ltsc2025, 8.0-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2025/amd64/Dockerfile)

### Nano Server 2022 amd64 Tags

Tag | Dockerfile
---------| ---------------
9.0.100-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
9.0.101-nanoserver-ltsc2022, 9.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/9.0/nanoserver-ltsc2022/amd64/Dockerfile)
8.0.404-nanoserver-ltsc2022, 8.0-nanoserver-ltsc2022 | [Dockerfile](src/sdk/8.0/nanoserver-ltsc2022/amd64/Dockerfile)

### Windows Server Core 2022 amd64 Tags

Tag | Dockerfile
---------| ---------------
9.0.100-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
9.0.101-windowsservercore-ltsc2022, 9.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2022/amd64/Dockerfile)
8.0.404-windowsservercore-ltsc2022, 8.0-windowsservercore-ltsc2022 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2022/amd64/Dockerfile)

### Nano Server, version 1809 amd64 Tags

Tag | Dockerfile
---------| ---------------
9.0.100-nanoserver-1809, 9.0-nanoserver-1809 | [Dockerfile](src/sdk/9.0/nanoserver-1809/amd64/Dockerfile)
9.0.101-nanoserver-1809, 9.0-nanoserver-1809 | [Dockerfile](src/sdk/9.0/nanoserver-1809/amd64/Dockerfile)
8.0.404-nanoserver-1809, 8.0-nanoserver-1809 | [Dockerfile](src/sdk/8.0/nanoserver-1809/amd64/Dockerfile)

### Windows Server Core 2019 amd64 Tags

Tag | Dockerfile
---------| ---------------
9.0.100-windowsservercore-ltsc2019, 9.0-windowsservercore-ltsc2019 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile)
9.0.101-windowsservercore-ltsc2019, 9.0-windowsservercore-ltsc2019 | [Dockerfile](src/sdk/9.0/windowsservercore-ltsc2019/amd64/Dockerfile)
8.0.404-windowsservercore-ltsc2019, 8.0-windowsservercore-ltsc2019 | [Dockerfile](src/sdk/8.0/windowsservercore-ltsc2019/amd64/Dockerfile)
<!--End of generated tags-->

Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/variables/samples.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ variables:
value: sample
- name: imageInfoVariant
value: "-samples"
- name: publishEolAnnotations
value: true
30 changes: 5 additions & 25 deletions manifest.samples.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,16 +311,8 @@
"productVersion": "$(dotnet|8.0|product-version)",
"sharedTags": {
"dotnetapp-8.0": {},
"dotnetapp": {
"syndication": {
"repo": "dotnet/core/samples"
}
},
"latest": {
"syndication": {
"repo": "dotnet/core/samples"
}
}
"dotnetapp": {},
"latest": {}
},
"platforms": [
{
Expand Down Expand Up @@ -375,11 +367,7 @@
"osVersion": "nanoserver-1809",
"tags": {
"dotnetapp-8.0-nanoserver-1809": {},
"dotnetapp-nanoserver-1809": {
"syndication": {
"repo": "dotnet/core/samples"
}
}
"dotnetapp-nanoserver-1809": {}
}
},
{
Expand Down Expand Up @@ -452,11 +440,7 @@
"productVersion": "$(dotnet|8.0|product-version)",
"sharedTags": {
"aspnetapp-8.0": {},
"aspnetapp": {
"syndication": {
"repo": "dotnet/core/samples"
}
}
"aspnetapp": {}
},
"platforms": [
{
Expand Down Expand Up @@ -538,11 +522,7 @@
"osVersion": "nanoserver-1809",
"tags": {
"aspnetapp-8.0-nanoserver-1809": {},
"aspnetapp-nanoserver-1809": {
"syndication": {
"repo": "dotnet/core/samples"
}
}
"aspnetapp-nanoserver-1809": {}
},
"customBuildLegGroups": [
{
Expand Down
18 changes: 9 additions & 9 deletions manifest.versions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,17 +192,17 @@
"sdk|8.0|linux|x64|sha": "2f166f7f3bd508154d72d1783ffac6e0e3c92023ccc2c6de49d22b411fc8b9e6dd03e7576acc1bb5870a6951181129ba77f3bf94bb45fe9c70105b1b896b9bb9",
"sdk|8.0|win|x64|sha": "fe2a799726fafa252352e6397dd790717f7263903408ccfedb0fb275ba93f96a7840dacc7f188e94d87671313d2a48480ea8387408ed5772b43c363e2dbba1ba",

"sdk|9.0|build-version": "9.0.100",
"sdk|9.0|product-version": "9.0.100",
"sdk|9.0|build-version": "9.0.101",
"sdk|9.0|product-version": "9.0.101",
"sdk|9.0|fixed-tag": "$(sdk|9.0|product-version)",
"sdk|9.0|minor-tag": "$(dotnet|9.0|minor-tag)",
"sdk|9.0|linux-musl|arm|sha": "b0920f80e866a7603cea628a1130df003bc5d7818275c8a5882a31c6e4e29f07322fc5cfd87333893e4131bd96130fb2384d008cbad704022c89267d52686e07",
"sdk|9.0|linux-musl|arm64|sha": "dae06d007327f6f53f50cb3a2884b93cd2fcbb73c756a8ac5ff673617f9bdf00093932f3a83652211fc2eeb57c271078644ef5c28a42897d8397f76d0e89586d",
"sdk|9.0|linux-musl|x64|sha": "e2032e6b4ed99adb3a92b7e041ea895ee09c6ed2455a1f68e55ed53bd613c8c20ef4aa5c434393bb5fdbc2f5635a83067f77451fe2fd3febcee264fe077acdaa",
"sdk|9.0|linux|arm|sha": "de06e89e559bc763ff6773bcf852d915ec47f2d89f4e7065ba0800da99ab56357f31437391a77d7096e405f63318625b0cb074f6b410036fbe906fce7f3794e8",
"sdk|9.0|linux|arm64|sha": "684450e6d1f7c711fffdbf32a2b86a932d17a51f4742bd27a4289e319c5b24f6743553fc7e0ad1c7163e448ed5c40cd1ecf4198b2e681acc4622d8e6193a5cf2",
"sdk|9.0|linux|x64|sha": "7f69bda047de1f952286be330a5e858171ded952d1aa24169e62212f90a27149e63b636c88ad313a6e3ec860da31f8c547ff4ab6808103a070f7fb26ba99c1c7",
"sdk|9.0|win|x64|sha": "fdc42c1b339335b3b9470401f731af4bdeca64c0c2aedf6ffda831eba0b18869f9a83855994bd9806644aeaa31e7086a9ced23319e45d66cf1a055c9f9cbb47f",
"sdk|9.0|linux-musl|arm|sha": "7e6560e69b83b9e64961e91155f8585421c3a2ce76897871d386492c623e9280f66f2284dc49362bc38739e48172523ce54b2269524437394ea3e908728a0118",
"sdk|9.0|linux-musl|arm64|sha": "6a6d6a6d6dfbdacb48374c0ac9bdb1c93781f3970c8778b0bee1f159a22b00176868264e605331fef833cb9fed829b4ffd414276d0d1140a8b0e257195c2f374",
"sdk|9.0|linux-musl|x64|sha": "3f4e14fb7b52dfb57b1e31cb5973e6e0a338f7f030f12b3082d3b55f12f9587ddf4926a7c5fcf86b7671397e44f8e5c20fb949d70e9a7dd0dc27be73a548dffc",
"sdk|9.0|linux|arm|sha": "cdf8989d02e4a6aa21e68081e956318c94c601583a757d5eb433919ebe7fa518f207aa0f58a09ee28cf95f445c486386c229de69891433a4a29145ef596aa1a4",
"sdk|9.0|linux|arm64|sha": "c5f9c17dded5101cb4b65ad1033ae4d82fc5b04303bdce4eb61a6dc47efa84202bd726d05caf117e536a01bd78ad773b8d23cbf43bc655e5eb9912b12078e0b1",
"sdk|9.0|linux|x64|sha": "91b37efd64242e5f1f3c2025d183eb34e17f3a9271c5602f29ddf794845eee103723ef955ed869788ebf5a731e8ddc69328799c92c64cb118e1328d259a6ad01",
"sdk|9.0|win|x64|sha": "53f16be2079ed85d230a6c98fa9220046930ca0eaaf1f928b63cfae9fd9a0a5ad87c60c07833ee16dedfa582ce5d9ae68b5b4292aec56fd44203fe9e7bcfba92",

"syft|repo": "anchore/syft",
"syft|tag": "v1.12.2"
Expand Down
2 changes: 1 addition & 1 deletion samples/aspnetapp/Dockerfile.chiseled-composite
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Learn about building .NET container images:
# https://github.com/dotnet/dotnet-docker/blob/main/samples/README.md
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build
ARG TARGETARCH
WORKDIR /source

Expand Down
4 changes: 2 additions & 2 deletions samples/kubernetes/graceful-shutdown/graceful-shutdown.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ app.Use((httpContext, next) =>
{
var hostLifetime = httpContext.RequestServices.GetRequiredService<IHostApplicationLifetime>();
var originalCt = httpContext.RequestAborted;
var combinedCt = CancellationTokenSource.CreateLinkedTokenSource(originalCt, hostLifetime.ApplicationStopping).Token;
httpContext.RequestAborted = combinedCt;
using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(originalCt, hostLifetime.ApplicationStopping);
httpContext.RequestAborted = combinedCts.Token;
return next(httpContext);
});
```
Expand Down
2 changes: 1 addition & 1 deletion src/sdk/9.0/alpine3.20-aot/amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG REPO=mcr.microsoft.com/dotnet/sdk
FROM $REPO:9.0.100-alpine3.20-amd64
FROM $REPO:9.0.101-alpine3.20-amd64

RUN apk add --upgrade --no-cache \
build-base \
Expand Down
2 changes: 1 addition & 1 deletion src/sdk/9.0/alpine3.20-aot/arm64v8/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG REPO=mcr.microsoft.com/dotnet/sdk
FROM $REPO:9.0.100-alpine3.20-arm64v8
FROM $REPO:9.0.101-alpine3.20-arm64v8

RUN apk add --upgrade --no-cache \
build-base \
Expand Down
4 changes: 2 additions & 2 deletions src/sdk/9.0/alpine3.20/amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV \
# Do not show first run text
DOTNET_NOLOGO=true \
# SDK version
DOTNET_SDK_VERSION=9.0.100 \
DOTNET_SDK_VERSION=9.0.101 \
# Disable the invariant mode (set in base image)
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
# Enable correct mode for dotnet watch (only mode supported in a container)
Expand All @@ -27,7 +27,7 @@ RUN apk add --upgrade --no-cache \

# Install .NET SDK
RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-x64.tar.gz \
&& dotnet_sha512='e2032e6b4ed99adb3a92b7e041ea895ee09c6ed2455a1f68e55ed53bd613c8c20ef4aa5c434393bb5fdbc2f5635a83067f77451fe2fd3febcee264fe077acdaa' \
&& dotnet_sha512='3f4e14fb7b52dfb57b1e31cb5973e6e0a338f7f030f12b3082d3b55f12f9587ddf4926a7c5fcf86b7671397e44f8e5c20fb949d70e9a7dd0dc27be73a548dffc' \
&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \
&& mkdir -p /usr/share/dotnet \
&& tar -oxzf dotnet.tar.gz -C /usr/share/dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
Expand Down
4 changes: 2 additions & 2 deletions src/sdk/9.0/alpine3.20/arm32v7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ENV \
# Do not show first run text
DOTNET_NOLOGO=true \
# SDK version
DOTNET_SDK_VERSION=9.0.100 \
DOTNET_SDK_VERSION=9.0.101 \
# Disable the invariant mode (set in base image)
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
# Enable correct mode for dotnet watch (only mode supported in a container)
Expand All @@ -27,7 +27,7 @@ RUN apk add --upgrade --no-cache \

# Install .NET SDK
RUN wget -O dotnet.tar.gz https://dotnetcli.azureedge.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-arm.tar.gz \
&& dotnet_sha512='b0920f80e866a7603cea628a1130df003bc5d7818275c8a5882a31c6e4e29f07322fc5cfd87333893e4131bd96130fb2384d008cbad704022c89267d52686e07' \
&& dotnet_sha512='7e6560e69b83b9e64961e91155f8585421c3a2ce76897871d386492c623e9280f66f2284dc49362bc38739e48172523ce54b2269524437394ea3e908728a0118' \
&& echo "$dotnet_sha512 dotnet.tar.gz" | sha512sum -c - \
&& mkdir -p /usr/share/dotnet \
&& tar -oxzf dotnet.tar.gz -C /usr/share/dotnet ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \
Expand Down
Loading

0 comments on commit 9c4bbff

Please sign in to comment.