Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add tzdata-legacy to Ubuntu 24.04 images #199

Merged
merged 3 commits into from
Oct 16, 2024
Merged

Add tzdata-legacy to Ubuntu 24.04 images #199

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
877ad0e
Add tzdata-legacy to Ubuntu 24.04 images
bdice Oct 16, 2024
f7ceae3
Remove extraneous brace
bdice Oct 16, 2024
ce89f2d
Use bash arrays
bdice Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ci-conda.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
bdice marked this conversation as resolved.
Show resolved Hide resolved
fi

apt-get update
apt-get upgrade -y
apt-get install -y --no-install-recommends \
tzdata
${tzdata_pkgs}
bdice marked this conversation as resolved.
Show resolved Hide resolved
rm -rf "/var/lib/apt/lists/*"
;;
"rockylinux"*)
Expand Down
13 changes: 12 additions & 1 deletion citestwheel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
bdice marked this conversation as resolved.
Show resolved Hide resolved
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}
bdice marked this conversation as resolved.
Show resolved Hide resolved
rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
;;
"rockylinux"*)
Expand Down
Loading