From 877ad0e9ac0decd288291b93d9255c4b06116cc8 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Wed, 16 Oct 2024 09:48:54 -0500
Subject: [PATCH 1/3] Add tzdata-legacy to Ubuntu 24.04 images

---
 ci-conda.Dockerfile    | 10 +++++++++-
 citestwheel.Dockerfile | 13 ++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
index 6391f7a..9338a12 100644
--- a/ci-conda.Dockerfile
+++ b/ci-conda.Dockerfile
@@ -56,13 +56,21 @@ echo ". /opt/conda/etc/profile.d/conda.sh; conda activate base" >> ~/.bashrc
 EOF
 
 # tzdata is needed by the ORC library used by pyarrow, because it provides /etc/localtime
+# On Ubuntu 24.04 and newer, we also need tzdata-legacy
 RUN <<EOF
 case "${LINUX_VER}" in
   "ubuntu"*)
+    os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2)
+    if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; }; then
+        tzdata_pkgs="tzdata tzdata-legacy"
+    else
+        tzdata_pkgs="tzdata"
+    fi
+
     apt-get update
     apt-get upgrade -y
     apt-get install -y --no-install-recommends \
-      tzdata
+      ${tzdata_pkgs}
     rm -rf "/var/lib/apt/lists/*"
     ;;
   "rockylinux"*)
diff --git a/citestwheel.Dockerfile b/citestwheel.Dockerfile
index f1ee892..78e98bc 100644
--- a/citestwheel.Dockerfile
+++ b/citestwheel.Dockerfile
@@ -35,12 +35,23 @@ case "${LINUX_VER}" in
     add-apt-repository ppa:git-core/ppa -y
     apt-get update
     apt-get upgrade -y
+
+    # tzdata is needed by the ORC library used by pyarrow, because it provides /etc/localtime
+    # On Ubuntu 24.04 and newer, we also need tzdata-legacy
+    os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2)
+    if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; }; then
+        tzdata_pkgs="tzdata tzdata-legacy"
+    else
+        tzdata_pkgs="tzdata"
+    fi
+
     apt-get install -y --no-install-recommends \
       wget curl git jq ssh \
       make build-essential libssl-dev zlib1g-dev \
       libbz2-dev libreadline-dev libsqlite3-dev wget \
       curl llvm libncursesw5-dev xz-utils tk-dev unzip \
-      libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
+      libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
+      ${tzdata_pkgs}
     rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
     ;;
   "rockylinux"*)

From f7ceae39328d406800c6345edd9f85e24c714520 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Wed, 16 Oct 2024 09:51:35 -0500
Subject: [PATCH 2/3] Remove extraneous brace

---
 ci-conda.Dockerfile    | 2 +-
 citestwheel.Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
index 9338a12..87b35b3 100644
--- a/ci-conda.Dockerfile
+++ b/ci-conda.Dockerfile
@@ -61,7 +61,7 @@ RUN <<EOF
 case "${LINUX_VER}" in
   "ubuntu"*)
     os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2)
-    if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; }; then
+    if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; then
         tzdata_pkgs="tzdata tzdata-legacy"
     else
         tzdata_pkgs="tzdata"
diff --git a/citestwheel.Dockerfile b/citestwheel.Dockerfile
index 78e98bc..220d436 100644
--- a/citestwheel.Dockerfile
+++ b/citestwheel.Dockerfile
@@ -39,7 +39,7 @@ case "${LINUX_VER}" in
     # tzdata is needed by the ORC library used by pyarrow, because it provides /etc/localtime
     # On Ubuntu 24.04 and newer, we also need tzdata-legacy
     os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2)
-    if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; }; then
+    if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; then
         tzdata_pkgs="tzdata tzdata-legacy"
     else
         tzdata_pkgs="tzdata"

From ce89f2ddd934493f8374c2fb7f2e85078b214da6 Mon Sep 17 00:00:00 2001
From: Bradley Dice <bdice@bradleydice.com>
Date: Wed, 16 Oct 2024 11:36:55 -0500
Subject: [PATCH 3/3] Use bash arrays

Co-authored-by: Kyle Edwards <kyedwards@nvidia.com>
---
 ci-conda.Dockerfile    | 6 +++---
 citestwheel.Dockerfile | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile
index 87b35b3..81bc59e 100644
--- a/ci-conda.Dockerfile
+++ b/ci-conda.Dockerfile
@@ -62,15 +62,15 @@ case "${LINUX_VER}" in
   "ubuntu"*)
     os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2)
     if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; then
-        tzdata_pkgs="tzdata tzdata-legacy"
+        tzdata_pkgs=(tzdata tzdata-legacy)
     else
-        tzdata_pkgs="tzdata"
+        tzdata_pkgs=(tzdata)
     fi
 
     apt-get update
     apt-get upgrade -y
     apt-get install -y --no-install-recommends \
-      ${tzdata_pkgs}
+      "${tzdata_pkgs[@]}"
     rm -rf "/var/lib/apt/lists/*"
     ;;
   "rockylinux"*)
diff --git a/citestwheel.Dockerfile b/citestwheel.Dockerfile
index 220d436..becac73 100644
--- a/citestwheel.Dockerfile
+++ b/citestwheel.Dockerfile
@@ -40,9 +40,9 @@ case "${LINUX_VER}" in
     # On Ubuntu 24.04 and newer, we also need tzdata-legacy
     os_version=$(grep 'VERSION_ID' /etc/os-release | cut -d '"' -f 2)
     if [[ "${os_version}" > "24.04" ]] || [[ "${os_version}" == "24.04" ]]; then
-        tzdata_pkgs="tzdata tzdata-legacy"
+        tzdata_pkgs=(tzdata tzdata-legacy)
     else
-        tzdata_pkgs="tzdata"
+        tzdata_pkgs=(tzdata)
     fi
 
     apt-get install -y --no-install-recommends \
@@ -51,7 +51,7 @@ case "${LINUX_VER}" in
       libbz2-dev libreadline-dev libsqlite3-dev wget \
       curl llvm libncursesw5-dev xz-utils tk-dev unzip \
       libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
-      ${tzdata_pkgs}
+      "${tzdata_pkgs[@]}"
     rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
     ;;
   "rockylinux"*)