From b49e8e56365fba12ab9d793dbc48c3292ad82d59 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 11 Dec 2024 09:09:40 -0800 Subject: [PATCH 1/2] Add tzdata-legacy to noble Dockerfiles --- .../Dockerfile.linux.install-deps | 27 ++++++++++--------- .../runtime-deps/Dockerfile.chiseled-ubuntu | 3 ++- .../8.0/noble-chiseled-extra/amd64/Dockerfile | 1 + .../noble-chiseled-extra/arm64v8/Dockerfile | 1 + src/runtime-deps/8.0/noble/amd64/Dockerfile | 1 + src/runtime-deps/8.0/noble/arm64v8/Dockerfile | 1 + .../9.0/noble-chiseled-extra/amd64/Dockerfile | 1 + .../noble-chiseled-extra/arm32v7/Dockerfile | 1 + .../noble-chiseled-extra/arm64v8/Dockerfile | 1 + src/runtime-deps/9.0/noble/amd64/Dockerfile | 1 + src/runtime-deps/9.0/noble/arm32v7/Dockerfile | 1 + src/runtime-deps/9.0/noble/arm64v8/Dockerfile | 1 + 12 files changed, 27 insertions(+), 13 deletions(-) diff --git a/eng/dockerfile-templates/Dockerfile.linux.install-deps b/eng/dockerfile-templates/Dockerfile.linux.install-deps index be5fe8c24c..b9627c7f3e 100644 --- a/eng/dockerfile-templates/Dockerfile.linux.install-deps +++ b/eng/dockerfile-templates/Dockerfile.linux.install-deps @@ -51,23 +51,26 @@ ] ))) ^ - set extraPkgs to sort(cat(standardPkgs, - when (isAzureLinux, + set extraPkgs to + sort(cat(standardPkgs, + when (isAzureLinux, [ "icu", "tzdata" ], when(isAlpine, - [ - "icu-data-full", - "icu-libs", - "tzdata" - ], - [ - cat("libicu", VARIABLES[cat("libicu|", OS_VERSION_BASE)]), - "tzdata" - ] - )))) ^ + [ + "icu-data-full", + "icu-libs", + "tzdata" + ], + cat( + [ + cat("libicu", VARIABLES[cat("libicu|", OS_VERSION_BASE)]), + "tzdata" + ], + when(OS_VERSION_BASE = "noble", [ "tzdata-legacy" ], [])) + )))) ^ set pkgs to when(ARGS["is-aot"], diff --git a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu index 2af22172e9..6ec3ed4a82 100644 --- a/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu +++ b/eng/dockerfile-templates/runtime-deps/Dockerfile.chiseled-ubuntu @@ -41,7 +41,8 @@ "tzdata_zoneinfo-icu" ], [ - "tzdata_zoneinfo" + "tzdata_zoneinfo", + "tzdata-legacy_zoneinfo" ]) ^ set icuPkgs to [ cat("libicu", VARIABLES[cat("libicu|", osVersionBase)], "_libs") ] ^ set extraPkgs to cat(sort(cat(standardPkgs, tzdataPkgs, icuPkgs))) ^ diff --git a/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile index 78962c603a..e880a5ca3c 100644 --- a/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile @@ -34,6 +34,7 @@ RUN mkdir -p /rootfs/var/lib/dpkg/ \ libicu74_libs \ libssl3t64_libs \ libstdc++6_libs \ + tzdata-legacy_zoneinfo \ tzdata_zoneinfo \ zlib1g_libs diff --git a/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile index 6d0f9bc588..674ff1cc2c 100644 --- a/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -34,6 +34,7 @@ RUN mkdir -p /rootfs/var/lib/dpkg/ \ libicu74_libs \ libssl3t64_libs \ libstdc++6_libs \ + tzdata-legacy_zoneinfo \ tzdata_zoneinfo \ zlib1g_libs diff --git a/src/runtime-deps/8.0/noble/amd64/Dockerfile b/src/runtime-deps/8.0/noble/amd64/Dockerfile index 57606a461b..be4d5a5d8e 100644 --- a/src/runtime-deps/8.0/noble/amd64/Dockerfile +++ b/src/runtime-deps/8.0/noble/amd64/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update \ libssl3t64 \ libstdc++6 \ tzdata \ + tzdata-legacy \ zlib1g \ && rm -rf /var/lib/apt/lists/* diff --git a/src/runtime-deps/8.0/noble/arm64v8/Dockerfile b/src/runtime-deps/8.0/noble/arm64v8/Dockerfile index 57606a461b..be4d5a5d8e 100644 --- a/src/runtime-deps/8.0/noble/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/noble/arm64v8/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update \ libssl3t64 \ libstdc++6 \ tzdata \ + tzdata-legacy \ zlib1g \ && rm -rf /var/lib/apt/lists/* diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile index 2094f1494c..4192ef8520 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile @@ -34,6 +34,7 @@ RUN mkdir -p /rootfs/var/lib/dpkg/ \ libicu74_libs \ libssl3t64_libs \ libstdc++6_libs \ + tzdata-legacy_zoneinfo \ tzdata_zoneinfo diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile index 405c8dadd0..2186d969a1 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -34,6 +34,7 @@ RUN mkdir -p /rootfs/var/lib/dpkg/ \ libicu74_libs \ libssl3t64_libs \ libstdc++6_libs \ + tzdata-legacy_zoneinfo \ tzdata_zoneinfo diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile index a07376f0ea..7e3afd4c86 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -34,6 +34,7 @@ RUN mkdir -p /rootfs/var/lib/dpkg/ \ libicu74_libs \ libssl3t64_libs \ libstdc++6_libs \ + tzdata-legacy_zoneinfo \ tzdata_zoneinfo diff --git a/src/runtime-deps/9.0/noble/amd64/Dockerfile b/src/runtime-deps/9.0/noble/amd64/Dockerfile index 2f4c3c769e..a1d110b291 100644 --- a/src/runtime-deps/9.0/noble/amd64/Dockerfile +++ b/src/runtime-deps/9.0/noble/amd64/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update \ libssl3t64 \ libstdc++6 \ tzdata \ + tzdata-legacy \ && rm -rf /var/lib/apt/lists/* # Create a non-root user and group diff --git a/src/runtime-deps/9.0/noble/arm32v7/Dockerfile b/src/runtime-deps/9.0/noble/arm32v7/Dockerfile index 2f4c3c769e..a1d110b291 100644 --- a/src/runtime-deps/9.0/noble/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/noble/arm32v7/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update \ libssl3t64 \ libstdc++6 \ tzdata \ + tzdata-legacy \ && rm -rf /var/lib/apt/lists/* # Create a non-root user and group diff --git a/src/runtime-deps/9.0/noble/arm64v8/Dockerfile b/src/runtime-deps/9.0/noble/arm64v8/Dockerfile index 2f4c3c769e..a1d110b291 100644 --- a/src/runtime-deps/9.0/noble/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/noble/arm64v8/Dockerfile @@ -19,6 +19,7 @@ RUN apt-get update \ libssl3t64 \ libstdc++6 \ tzdata \ + tzdata-legacy \ && rm -rf /var/lib/apt/lists/* # Create a non-root user and group From 1decce55b50510776abb191bfd2da972b85f9471 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 11 Dec 2024 09:09:47 -0800 Subject: [PATCH 2/2] Update test data --- tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs index df08a224de..fcb873357f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs @@ -424,6 +424,7 @@ private static IEnumerable GetRuntimeDepsPackages(ProductImageData image { OS: OS.NobleChiseled } => new[] { "libicu74", + "tzdata-legacy", "tzdata" }, { OS: OS.JammyChiseled } => new[]