Skip to content

Commit b19502c

Browse files
lbusselllbussell
authored
Add Debian 13 "Trixie" images for .NET 10 (#6185)
1 parent 4ebd538 commit b19502c

File tree

29 files changed

+161
-126
lines changed

29 files changed

+161
-126
lines changed

‎README.aspnet.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Tags | Dockerfile | OS Version
142142
10.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 10.0-preview-azurelinux3.0-distroless-extra-amd64, 10.0.0-alpha.1-azurelinux3.0-distroless-extra, 10.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
143143
10.0.0-alpha.1-azurelinux3.0-distroless-composite-amd64, 10.0-preview-azurelinux3.0-distroless-composite-amd64, 10.0.0-alpha.1-azurelinux3.0-distroless-composite, 10.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0
144144
10.0.0-alpha.1-azurelinux3.0-distroless-composite-extra-amd64, 10.0-preview-azurelinux3.0-distroless-composite-extra-amd64, 10.0.0-alpha.1-azurelinux3.0-distroless-composite-extra, 10.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0
145-
10.0.0-alpha.1-bookworm-slim-amd64, 10.0-preview-bookworm-slim-amd64, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/aspnet/10.0/bookworm-slim/amd64/Dockerfile) | Debian 12
145+
10.0.0-alpha.1-trixie-slim-amd64, 10.0-preview-trixie-slim-amd64, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/aspnet/10.0/trixie-slim/amd64/Dockerfile) | Debian 13
146146

147147
### Linux arm64 Tags
148148

@@ -205,7 +205,7 @@ Tags | Dockerfile | OS Version
205205
10.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 10.0-preview-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-alpha.1-azurelinux3.0-distroless-extra, 10.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
206206
10.0.0-alpha.1-azurelinux3.0-distroless-composite-arm64v8, 10.0-preview-azurelinux3.0-distroless-composite-arm64v8, 10.0.0-alpha.1-azurelinux3.0-distroless-composite, 10.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0
207207
10.0.0-alpha.1-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0-preview-azurelinux3.0-distroless-composite-extra-arm64v8, 10.0.0-alpha.1-azurelinux3.0-distroless-composite-extra, 10.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/10.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0
208-
10.0.0-alpha.1-bookworm-slim-arm64v8, 10.0-preview-bookworm-slim-arm64v8, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/aspnet/10.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
208+
10.0.0-alpha.1-trixie-slim-arm64v8, 10.0-preview-trixie-slim-arm64v8, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/aspnet/10.0/trixie-slim/arm64v8/Dockerfile) | Debian 13
209209

210210
### Linux arm32 Tags
211211

@@ -243,7 +243,7 @@ Tags | Dockerfile | OS Version
243243
10.0.0-alpha.1-noble-chiseled-composite-extra-arm32v7, 10.0-preview-noble-chiseled-composite-extra-arm32v7, 10.0.0-alpha.1-noble-chiseled-composite-extra, 10.0-preview-noble-chiseled-composite-extra | [Dockerfile](src/aspnet/10.0/noble-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 24.04
244244
10.0.0-alpha.1-alpine3.21-arm32v7, 10.0-preview-alpine3.21-arm32v7, 10.0-preview-alpine-arm32v7, 10.0.0-alpha.1-alpine3.21, 10.0-preview-alpine3.21, 10.0-preview-alpine | [Dockerfile](src/aspnet/10.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21
245245
10.0.0-alpha.1-alpine3.21-composite-arm32v7, 10.0-preview-alpine3.21-composite-arm32v7, 10.0-preview-alpine-composite-arm32v7, 10.0.0-alpha.1-alpine3.21-composite, 10.0-preview-alpine3.21-composite, 10.0-preview-alpine-composite | [Dockerfile](src/aspnet/10.0/alpine3.21-composite/arm32v7/Dockerfile) | Alpine 3.21
246-
10.0.0-alpha.1-bookworm-slim-arm32v7, 10.0-preview-bookworm-slim-arm32v7, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/aspnet/10.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
246+
10.0.0-alpha.1-trixie-slim-arm32v7, 10.0-preview-trixie-slim-arm32v7, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/aspnet/10.0/trixie-slim/arm32v7/Dockerfile) | Debian 13
247247

248248
### Nano Server 2025 amd64 Tags
249249

‎README.runtime-deps.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Tags | Dockerfile | OS Version
117117
10.0.0-alpha.1-azurelinux3.0-amd64, 10.0-preview-azurelinux3.0-amd64, 10.0.0-alpha.1-azurelinux3.0, 10.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
118118
10.0.0-alpha.1-azurelinux3.0-distroless-amd64, 10.0-preview-azurelinux3.0-distroless-amd64, 10.0.0-alpha.1-azurelinux3.0-distroless, 10.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
119119
10.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 10.0-preview-azurelinux3.0-distroless-extra-amd64, 10.0.0-alpha.1-azurelinux3.0-distroless-extra, 10.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
120-
10.0.0-alpha.1-bookworm-slim-amd64, 10.0-preview-bookworm-slim-amd64, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/runtime-deps/10.0/bookworm-slim/amd64/Dockerfile) | Debian 12
120+
10.0.0-alpha.1-trixie-slim-amd64, 10.0-preview-trixie-slim-amd64, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/runtime-deps/10.0/trixie-slim/amd64/Dockerfile) | Debian 13
121121

122122
### Linux arm64 Tags
123123

@@ -174,7 +174,7 @@ Tags | Dockerfile | OS Version
174174
10.0.0-alpha.1-azurelinux3.0-arm64v8, 10.0-preview-azurelinux3.0-arm64v8, 10.0.0-alpha.1-azurelinux3.0, 10.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
175175
10.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 10.0-preview-azurelinux3.0-distroless-arm64v8, 10.0.0-alpha.1-azurelinux3.0-distroless, 10.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
176176
10.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 10.0-preview-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-alpha.1-azurelinux3.0-distroless-extra, 10.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
177-
10.0.0-alpha.1-bookworm-slim-arm64v8, 10.0-preview-bookworm-slim-arm64v8, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/runtime-deps/10.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
177+
10.0.0-alpha.1-trixie-slim-arm64v8, 10.0-preview-trixie-slim-arm64v8, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/runtime-deps/10.0/trixie-slim/arm64v8/Dockerfile) | Debian 13
178178

179179
### Linux arm32 Tags
180180

@@ -212,7 +212,7 @@ Tags | Dockerfile | OS Version
212212
10.0.0-alpha.1-noble-chiseled-extra-arm32v7, 10.0-preview-noble-chiseled-extra-arm32v7, 10.0.0-alpha.1-noble-chiseled-extra, 10.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
213213
10.0.0-alpha.1-alpine3.21-arm32v7, 10.0-preview-alpine3.21-arm32v7, 10.0-preview-alpine-arm32v7, 10.0.0-alpha.1-alpine3.21, 10.0-preview-alpine3.21, 10.0-preview-alpine | [Dockerfile](src/runtime-deps/10.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21
214214
10.0.0-alpha.1-alpine3.21-extra-arm32v7, 10.0-preview-alpine3.21-extra-arm32v7, 10.0-preview-alpine-extra-arm32v7, 10.0.0-alpha.1-alpine3.21-extra, 10.0-preview-alpine3.21-extra, 10.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/10.0/alpine3.21-extra/arm32v7/Dockerfile) | Alpine 3.21
215-
10.0.0-alpha.1-bookworm-slim-arm32v7, 10.0-preview-bookworm-slim-arm32v7, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/runtime-deps/10.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
215+
10.0.0-alpha.1-trixie-slim-arm32v7, 10.0-preview-trixie-slim-arm32v7, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/runtime-deps/10.0/trixie-slim/arm32v7/Dockerfile) | Debian 13
216216
<!--End of generated tags-->
217217

218218
*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/runtime-deps/tags/list) for all supported and unsupported tags.*

‎README.runtime.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Tags | Dockerfile | OS Version
110110
10.0.0-alpha.1-azurelinux3.0-amd64, 10.0-preview-azurelinux3.0-amd64, 10.0.0-alpha.1-azurelinux3.0, 10.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
111111
10.0.0-alpha.1-azurelinux3.0-distroless-amd64, 10.0-preview-azurelinux3.0-distroless-amd64, 10.0.0-alpha.1-azurelinux3.0-distroless, 10.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0
112112
10.0.0-alpha.1-azurelinux3.0-distroless-extra-amd64, 10.0-preview-azurelinux3.0-distroless-extra-amd64, 10.0.0-alpha.1-azurelinux3.0-distroless-extra, 10.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0
113-
10.0.0-alpha.1-bookworm-slim-amd64, 10.0-preview-bookworm-slim-amd64, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/runtime/10.0/bookworm-slim/amd64/Dockerfile) | Debian 12
113+
10.0.0-alpha.1-trixie-slim-amd64, 10.0-preview-trixie-slim-amd64, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/runtime/10.0/trixie-slim/amd64/Dockerfile) | Debian 13
114114

115115
### Linux arm64 Tags
116116

@@ -152,7 +152,7 @@ Tags | Dockerfile | OS Version
152152
10.0.0-alpha.1-azurelinux3.0-arm64v8, 10.0-preview-azurelinux3.0-arm64v8, 10.0.0-alpha.1-azurelinux3.0, 10.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
153153
10.0.0-alpha.1-azurelinux3.0-distroless-arm64v8, 10.0-preview-azurelinux3.0-distroless-arm64v8, 10.0.0-alpha.1-azurelinux3.0-distroless, 10.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0
154154
10.0.0-alpha.1-azurelinux3.0-distroless-extra-arm64v8, 10.0-preview-azurelinux3.0-distroless-extra-arm64v8, 10.0.0-alpha.1-azurelinux3.0-distroless-extra, 10.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/10.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0
155-
10.0.0-alpha.1-bookworm-slim-arm64v8, 10.0-preview-bookworm-slim-arm64v8, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/runtime/10.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
155+
10.0.0-alpha.1-trixie-slim-arm64v8, 10.0-preview-trixie-slim-arm64v8, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/runtime/10.0/trixie-slim/arm64v8/Dockerfile) | Debian 13
156156

157157
### Linux arm32 Tags
158158

@@ -179,7 +179,7 @@ Tags | Dockerfile | OS Version
179179
10.0.0-alpha.1-noble-chiseled-arm32v7, 10.0-preview-noble-chiseled-arm32v7, 10.0.0-alpha.1-noble-chiseled, 10.0-preview-noble-chiseled | [Dockerfile](src/runtime/10.0/noble-chiseled/arm32v7/Dockerfile) | Ubuntu 24.04
180180
10.0.0-alpha.1-noble-chiseled-extra-arm32v7, 10.0-preview-noble-chiseled-extra-arm32v7, 10.0.0-alpha.1-noble-chiseled-extra, 10.0-preview-noble-chiseled-extra | [Dockerfile](src/runtime/10.0/noble-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 24.04
181181
10.0.0-alpha.1-alpine3.21-arm32v7, 10.0-preview-alpine3.21-arm32v7, 10.0-preview-alpine-arm32v7, 10.0.0-alpha.1-alpine3.21, 10.0-preview-alpine3.21, 10.0-preview-alpine | [Dockerfile](src/runtime/10.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21
182-
10.0.0-alpha.1-bookworm-slim-arm32v7, 10.0-preview-bookworm-slim-arm32v7, 10.0.0-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/runtime/10.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
182+
10.0.0-alpha.1-trixie-slim-arm32v7, 10.0-preview-trixie-slim-arm32v7, 10.0.0-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/runtime/10.0/trixie-slim/arm32v7/Dockerfile) | Debian 13
183183

184184
### Nano Server 2025 amd64 Tags
185185

‎README.sdk.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Tags | Dockerfile | OS Version
100100
10.0.100-alpha.1-noble-amd64, 10.0-preview-noble-amd64, 10.0.100-alpha.1-noble, 10.0-preview-noble, 10.0.100-alpha.1, 10.0-preview, latest | [Dockerfile](src/sdk/10.0/noble/amd64/Dockerfile) | Ubuntu 24.04
101101
10.0.100-alpha.1-alpine3.21-amd64, 10.0-preview-alpine3.21-amd64, 10.0-preview-alpine-amd64, 10.0.100-alpha.1-alpine3.21, 10.0-preview-alpine3.21, 10.0-preview-alpine | [Dockerfile](src/sdk/10.0/alpine3.21/amd64/Dockerfile) | Alpine 3.21
102102
10.0.100-alpha.1-azurelinux3.0-amd64, 10.0-preview-azurelinux3.0-amd64, 10.0.100-alpha.1-azurelinux3.0, 10.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0
103-
10.0.100-alpha.1-bookworm-slim-amd64, 10.0-preview-bookworm-slim-amd64, 10.0.100-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/sdk/10.0/bookworm-slim/amd64/Dockerfile) | Debian 12
103+
10.0.100-alpha.1-trixie-slim-amd64, 10.0-preview-trixie-slim-amd64, 10.0.100-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/sdk/10.0/trixie-slim/amd64/Dockerfile) | Debian 13
104104

105105
### Linux arm64 Tags
106106

@@ -136,7 +136,7 @@ Tags | Dockerfile | OS Version
136136
10.0.100-alpha.1-noble-arm64v8, 10.0-preview-noble-arm64v8, 10.0.100-alpha.1-noble, 10.0-preview-noble, 10.0.100-alpha.1, 10.0-preview, latest | [Dockerfile](src/sdk/10.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
137137
10.0.100-alpha.1-alpine3.21-arm64v8, 10.0-preview-alpine3.21-arm64v8, 10.0-preview-alpine-arm64v8, 10.0.100-alpha.1-alpine3.21, 10.0-preview-alpine3.21, 10.0-preview-alpine | [Dockerfile](src/sdk/10.0/alpine3.21/arm64v8/Dockerfile) | Alpine 3.21
138138
10.0.100-alpha.1-azurelinux3.0-arm64v8, 10.0-preview-azurelinux3.0-arm64v8, 10.0.100-alpha.1-azurelinux3.0, 10.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0
139-
10.0.100-alpha.1-bookworm-slim-arm64v8, 10.0-preview-bookworm-slim-arm64v8, 10.0.100-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/sdk/10.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12
139+
10.0.100-alpha.1-trixie-slim-arm64v8, 10.0-preview-trixie-slim-arm64v8, 10.0.100-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/sdk/10.0/trixie-slim/arm64v8/Dockerfile) | Debian 13
140140

141141
### Linux arm32 Tags
142142

@@ -157,7 +157,7 @@ Tags | Dockerfile | OS Version
157157
-----------| -------------| -------------
158158
10.0.100-alpha.1-noble-arm32v7, 10.0-preview-noble-arm32v7, 10.0.100-alpha.1-noble, 10.0-preview-noble, 10.0.100-alpha.1, 10.0-preview, latest | [Dockerfile](src/sdk/10.0/noble/arm32v7/Dockerfile) | Ubuntu 24.04
159159
10.0.100-alpha.1-alpine3.21-arm32v7, 10.0-preview-alpine3.21-arm32v7, 10.0-preview-alpine-arm32v7, 10.0.100-alpha.1-alpine3.21, 10.0-preview-alpine3.21, 10.0-preview-alpine | [Dockerfile](src/sdk/10.0/alpine3.21/arm32v7/Dockerfile) | Alpine 3.21
160-
10.0.100-alpha.1-bookworm-slim-arm32v7, 10.0-preview-bookworm-slim-arm32v7, 10.0.100-alpha.1-bookworm-slim, 10.0-preview-bookworm-slim | [Dockerfile](src/sdk/10.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12
160+
10.0.100-alpha.1-trixie-slim-arm32v7, 10.0-preview-trixie-slim-arm32v7, 10.0.100-alpha.1-trixie-slim, 10.0-preview-trixie-slim | [Dockerfile](src/sdk/10.0/trixie-slim/arm32v7/Dockerfile) | Debian 13
161161

162162
### Nano Server 2025 amd64 Tags
163163

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,12 @@
2121
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
2222

2323
_ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
24-
set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
24+
_ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
25+
set osVersionBase to
26+
when(ARCH_VERSIONED = "arm32v7",
27+
when(osVersionBase = "noble", "jammy",
28+
when(osVersionBase = "trixie", "bookworm", osVersionBase)),
29+
osVersionBase) ^
2530

2631
set installerImageTag to when(isDistrolessAzureLinux,
2732
cat("mcr.microsoft.com/"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^
2020

2121
_ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
22-
set osVersionBase to when(osVersionBase = "noble" && ARCH_VERSIONED = "arm32v7", "jammy", osVersionBase) ^
22+
set osVersionBase to
23+
when(ARCH_VERSIONED = "arm32v7",
24+
when(osVersionBase = "noble", "jammy",
25+
when(osVersionBase = "trixie", "bookworm", osVersionBase)),
26+
osVersionBase) ^
2327

2428
set installerImageTag to when(isDistrolessAzureLinux,
2529
cat("mcr.microsoft.com/"

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@
99
set baseImageTag to cat("$REPO:", tagVersion, "-", OS_VERSION, ARCH_TAG_SUFFIX) ^
1010

1111
_ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
12-
set useNobleArm32Workaround to OS_VERSION_BASE = "noble" && ARCH_SHORT = "arm" ^
13-
set osVersionBase to when(useNobleArm32Workaround, "jammy", OS_VERSION_BASE) ^
12+
set useJammyArm32Workaround to (OS_VERSION_BASE = "noble" || OS_VERSION_BASE = "trixie") && ARCH_SHORT = "arm" ^
13+
set osVersionBase to
14+
when(useJammyArm32Workaround,
15+
when(OS_VERSION_BASE = "noble",
16+
"jammy",
17+
"bookworm"),
18+
OS_VERSION_BASE) ^
1419

1520
set internalInstallerBase to when(isAlpine || isAzureLinux,
1621
baseImageTag,
@@ -57,7 +62,7 @@
5762
]
5863
)), len)
5964
}}ARG REPO=mcr.microsoft.com/dotnet/aspnet
60-
{{if isInternal || useNobleArm32Workaround:# Installer image
65+
{{if isInternal || useJammyArm32Workaround:# Installer image
6166
FROM {{internalInstallerBase}} AS installer{{if isInternal:
6267

6368
ARG ACCESSTOKEN}}
@@ -71,8 +76,8 @@ RUN {{InsertTemplate("../Dockerfile.linux.install-pkgs",
7176
[
7277
"install-method": "download-and-install",
7378
"is-internal": isInternal,
74-
"disable-first-run-experience": useNobleArm32Workaround,
75-
"no-version-env-var": useNobleArm32Workaround
79+
"disable-first-run-experience": useJammyArm32Workaround,
80+
"no-version-env-var": useJammyArm32Workaround
7681
])}}
7782

7883

@@ -86,7 +91,7 @@ RUN {{InsertTemplate("../Dockerfile.linux.install-pkgs",
8691
"pkgs": pkgs
8792
])}}
8893

89-
{{if isInternal || useNobleArm32Workaround:COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
94+
{{if isInternal || useJammyArm32Workaround:COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"]
9095

9196
{{InsertTemplate("Dockerfile.linux.first-run")}}^else:{{
9297
InsertTemplate("Dockerfile.linux.install-sdk",

‎eng/mcr-tags-metadata-templates/aspnet-tags.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless|.NET 10 Preview Tags)
1111
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-extra|.NET 10 Preview Tags)
1212
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-composite|.NET 10 Preview Tags)
1313
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-composite-extra|.NET 10 Preview Tags)
14-
$(McrTagsYmlTagGroup:10.0-preview-bookworm-slim|.NET 10 Preview Tags)
14+
$(McrTagsYmlTagGroup:10.0-preview-trixie-slim|.NET 10 Preview Tags)
1515
$(McrTagsYmlTagGroup:9.0-bookworm-slim)
1616
$(McrTagsYmlTagGroup:9.0-alpine3.21)
1717
$(McrTagsYmlTagGroup:9.0-alpine3.21-composite)

‎eng/mcr-tags-metadata-templates/runtime-deps-tags.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $(McrTagsYmlTagGroup:10.0-preview-alpine3.21-extra|.NET 10 Preview Tags)
77
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0|.NET 10 Preview Tags)
88
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless|.NET 10 Preview Tags)
99
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-extra|.NET 10 Preview Tags)
10-
$(McrTagsYmlTagGroup:10.0-preview-bookworm-slim|.NET 10 Preview Tags)
10+
$(McrTagsYmlTagGroup:10.0-preview-trixie-slim|.NET 10 Preview Tags)
1111
$(McrTagsYmlTagGroup:9.0-bookworm-slim)
1212
$(McrTagsYmlTagGroup:9.0-alpine3.21)
1313
$(McrTagsYmlTagGroup:9.0-alpine3.21-aot)

0 commit comments

Comments
 (0)