From 05db1f7cb43efa21c118006b08d492d64d5040d0 Mon Sep 17 00:00:00 2001
From: Shin <2082119+shinsenter@users.noreply.github.com>
Date: Tue, 20 Aug 2024 20:16:31 +0900
Subject: [PATCH] [5.x] Add timezone data to the alpine variants (#126)

---
 src/php/common/docker-php-entrypoint | 1 +
 src/php/common/os-base.dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/php/common/docker-php-entrypoint b/src/php/common/docker-php-entrypoint
index 4fd7611d..d58e79f6 100755
--- a/src/php/common/docker-php-entrypoint
+++ b/src/php/common/docker-php-entrypoint
@@ -16,6 +16,7 @@ mkdir -p "$APP_PATH"
 export TZ="${TZ:=UTC}"
 if [ ! -z "$TZ" ] && [ -e /usr/share/zoneinfo/$TZ ]; then
     ln -nsf /usr/share/zoneinfo/$TZ /etc/localtime
+    echo $TZ >/etc/timezone
 fi
 
 # activity logging
diff --git a/src/php/common/os-base.dockerfile b/src/php/common/os-base.dockerfile
index 597f79c5..0de62632 100644
--- a/src/php/common/os-base.dockerfile
+++ b/src/php/common/os-base.dockerfile
@@ -51,7 +51,7 @@ set -e
 chmod 4755 $(which autorun) /usr/local/sbin/web-*
 
 # install common packages
-APK_PACKAGES='run-parts shadow su-exec tar unzip xz' \
+APK_PACKAGES='run-parts shadow su-exec tar tzdata unzip xz' \
 APT_PACKAGES='procps xz-utils' \
 pkg-add bash ca-certificates coreutils curl htop less openssl
 pkg-add upgrade