Commit 3b11b69
Add tzdata-legacy to Ubuntu Resolute images
The tzdata-legacy condition in the non-chiseled Dockerfile template was
hardcoded to OS_VERSION_BASE = "noble". When Resolute (26.04) was added
for .NET 11, the condition didn't match, so tzdata-legacy was silently
dropped. This caused TimeZoneInfo.FindSystemTimeZoneById to fail for
legacy timezone IDs like 'FLE Standard Time' (Europe/Kiev).
Change the condition to install tzdata-legacy on all Ubuntu versions
except Jammy, matching the pattern already used in the chiseled template.
Fixes #7087
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent bca8500 commit 3b11b69
5 files changed
Lines changed: 10 additions & 1 deletion
File tree
- eng/dockerfile-templates
- src/runtime-deps/11.0/resolute
- amd64
- arm32v7
- arm64v8
- tests/Microsoft.DotNet.Docker.Tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
379 | 379 | | |
380 | 380 | | |
381 | 381 | | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
382 | 388 | | |
383 | 389 | | |
384 | 390 | | |
| |||
0 commit comments