Skip to content

Commit

Permalink
Add Debian 13 "Trixie" images for .NET 10 (#6185)
Browse files Browse the repository at this point in the history
  • Loading branch information
lbussell authored Jan 30, 2025
1 parent 4ebd538 commit b19502c
Show file tree
Hide file tree
Showing 29 changed files with 161 additions and 126 deletions.
6 changes: 3 additions & 3 deletions README.aspnet.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Linux arm64 Tags

Expand Down Expand Up @@ -205,7 +205,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Linux arm32 Tags

Expand Down Expand Up @@ -243,7 +243,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Nano Server 2025 amd64 Tags

Expand Down
6 changes: 3 additions & 3 deletions README.runtime-deps.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Linux arm64 Tags

Expand Down Expand Up @@ -174,7 +174,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Linux arm32 Tags

Expand Down Expand Up @@ -212,7 +212,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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
<!--End of generated tags-->

*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.*
Expand Down
6 changes: 3 additions & 3 deletions README.runtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Linux arm64 Tags

Expand Down Expand Up @@ -152,7 +152,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Linux arm32 Tags

Expand All @@ -179,7 +179,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Nano Server 2025 amd64 Tags

Expand Down
6 changes: 3 additions & 3 deletions README.sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Linux arm64 Tags

Expand Down Expand Up @@ -136,7 +136,7 @@ Tags | Dockerfile | OS Version
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
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
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
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
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

### Linux arm32 Tags

Expand All @@ -157,7 +157,7 @@ Tags | Dockerfile | OS Version
-----------| -------------| -------------
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
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
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
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

### Nano Server 2025 amd64 Tags

Expand Down
7 changes: 6 additions & 1 deletion eng/dockerfile-templates/aspnet/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^

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

set installerImageTag to when(isDistrolessAzureLinux,
cat("mcr.microsoft.com/"
Expand Down
6 changes: 5 additions & 1 deletion eng/dockerfile-templates/runtime/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@
set osVersionBase to when(isDistroless, match(OS_VERSION, ".+(?=.*-)")[0], OS_VERSION_BASE) ^

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

set installerImageTag to when(isDistrolessAzureLinux,
cat("mcr.microsoft.com/"
Expand Down
17 changes: 11 additions & 6 deletions eng/dockerfile-templates/sdk/Dockerfile.linux
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,13 @@
set baseImageTag to cat("$REPO:", tagVersion, "-", OS_VERSION, ARCH_TAG_SUFFIX) ^

_ Workaround for https://bugs.launchpad.net/ubuntu/+source/tar/+bug/2059734. Remove when fixed. ^
set useNobleArm32Workaround to OS_VERSION_BASE = "noble" && ARCH_SHORT = "arm" ^
set osVersionBase to when(useNobleArm32Workaround, "jammy", OS_VERSION_BASE) ^
set useJammyArm32Workaround to (OS_VERSION_BASE = "noble" || OS_VERSION_BASE = "trixie") && ARCH_SHORT = "arm" ^
set osVersionBase to
when(useJammyArm32Workaround,
when(OS_VERSION_BASE = "noble",
"jammy",
"bookworm"),
OS_VERSION_BASE) ^

set internalInstallerBase to when(isAlpine || isAzureLinux,
baseImageTag,
Expand Down Expand Up @@ -57,7 +62,7 @@
]
)), len)
}}ARG REPO=mcr.microsoft.com/dotnet/aspnet
{{if isInternal || useNobleArm32Workaround:# Installer image
{{if isInternal || useJammyArm32Workaround:# Installer image
FROM {{internalInstallerBase}} AS installer{{if isInternal:

ARG ACCESSTOKEN}}
Expand All @@ -71,8 +76,8 @@ RUN {{InsertTemplate("../Dockerfile.linux.install-pkgs",
[
"install-method": "download-and-install",
"is-internal": isInternal,
"disable-first-run-experience": useNobleArm32Workaround,
"no-version-env-var": useNobleArm32Workaround
"disable-first-run-experience": useJammyArm32Workaround,
"no-version-env-var": useJammyArm32Workaround
])}}


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

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

{{InsertTemplate("Dockerfile.linux.first-run")}}^else:{{
InsertTemplate("Dockerfile.linux.install-sdk",
Expand Down
2 changes: 1 addition & 1 deletion eng/mcr-tags-metadata-templates/aspnet-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-extra|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-composite|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-composite-extra|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-bookworm-slim|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-trixie-slim|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:9.0-bookworm-slim)
$(McrTagsYmlTagGroup:9.0-alpine3.21)
$(McrTagsYmlTagGroup:9.0-alpine3.21-composite)
Expand Down
2 changes: 1 addition & 1 deletion eng/mcr-tags-metadata-templates/runtime-deps-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $(McrTagsYmlTagGroup:10.0-preview-alpine3.21-extra|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-azurelinux3.0-distroless-extra|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-bookworm-slim|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:10.0-preview-trixie-slim|.NET 10 Preview Tags)
$(McrTagsYmlTagGroup:9.0-bookworm-slim)
$(McrTagsYmlTagGroup:9.0-alpine3.21)
$(McrTagsYmlTagGroup:9.0-alpine3.21-aot)
Expand Down
Loading

0 comments on commit b19502c

Please sign in to comment.