Skip to content

Commit 806df3e

Browse files
lbussellCopilot
andcommitted
Fix 10.0 runtime resolute-chiseled-extra template references
The manifest.json entries for runtime/10.0/resolute-chiseled-extra referenced Dockerfile.linux instead of Dockerfile.linux.extra, causing the generated Dockerfiles to use the base chiseled runtime-deps image (missing -extra suffix in the FROM tag). This meant runtime and aspnet chiseled-extra images were built without ICU/tzdata packages. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent c996f6d commit 806df3e

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5040,7 +5040,7 @@
50405040
"REPO": "$(Repo:runtime-deps)"
50415041
},
50425042
"dockerfile": "src/runtime/10.0/resolute-chiseled-extra/amd64",
5043-
"dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
5043+
"dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
50445044
"os": "linux",
50455045
"osVersion": "resolute-chiseled",
50465046
"tags": {
@@ -5070,7 +5070,7 @@
50705070
"REPO": "$(Repo:runtime-deps)"
50715071
},
50725072
"dockerfile": "src/runtime/10.0/resolute-chiseled-extra/arm64v8",
5073-
"dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
5073+
"dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
50745074
"os": "linux",
50755075
"osVersion": "resolute-chiseled",
50765076
"tags": {
@@ -5101,7 +5101,7 @@
51015101
"REPO": "$(Repo:runtime-deps)"
51025102
},
51035103
"dockerfile": "src/runtime/10.0/resolute-chiseled-extra/arm32v7",
5104-
"dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux",
5104+
"dockerfileTemplate": "eng/dockerfile-templates/runtime/Dockerfile.linux.extra",
51055105
"os": "linux",
51065106
"osVersion": "resolute-chiseled",
51075107
"tags": {

src/runtime/10.0/resolute-chiseled-extra/amd64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN mkdir /dotnet-symlink \
2020

2121

2222
# .NET runtime image
23-
FROM $REPO:10.0.5-resolute-chiseled-amd64
23+
FROM $REPO:10.0.5-resolute-chiseled-extra-amd64
2424

2525
# .NET Runtime version
2626
ENV DOTNET_VERSION=10.0.5

src/runtime/10.0/resolute-chiseled-extra/arm32v7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN mkdir /dotnet-symlink \
2020

2121

2222
# .NET runtime image
23-
FROM $REPO:10.0.5-resolute-chiseled-arm32v7
23+
FROM $REPO:10.0.5-resolute-chiseled-extra-arm32v7
2424

2525
# .NET Runtime version
2626
ENV DOTNET_VERSION=10.0.5

src/runtime/10.0/resolute-chiseled-extra/arm64v8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN mkdir /dotnet-symlink \
2020

2121

2222
# .NET runtime image
23-
FROM $REPO:10.0.5-resolute-chiseled-arm64v8
23+
FROM $REPO:10.0.5-resolute-chiseled-extra-arm64v8
2424

2525
# .NET Runtime version
2626
ENV DOTNET_VERSION=10.0.5

0 commit comments

Comments
 (0)