Add tzdata-legacy package to Ubuntu Noble and Noble Chiseled `extra…

…` images (dotnet#6110)
lbussell · Jan 7, 2025 · 3250dca · 3250dca
1 parent 4f39b60
commit 3250dca
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs
@@ -424,6 +424,7 @@ private static IEnumerable<string> GetRuntimeDepsPackages(ProductImageData image
                 { OS: OS.NobleChiseled } => new[]
                     {
                         "libicu74",
+                        "tzdata-legacy",
                         "tzdata"
                     },
                 { OS: OS.JammyChiseled } => new[]