feat(output): align container timezone with host
This commit is contained in:
@@ -19,10 +19,43 @@ fi
|
||||
CALLER_UID=$(id -u)
|
||||
CALLER_GID=$(id -g)
|
||||
|
||||
detect_timezone() {
|
||||
if command -v timedatectl >/dev/null 2>&1; then
|
||||
local tz
|
||||
tz=$(timedatectl show --property=Timezone --value 2>/dev/null)
|
||||
if [ -n "${tz}" ]; then
|
||||
printf '%s\n' "${tz}"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -f /etc/timezone ]; then
|
||||
local tz
|
||||
tz=$(cat /etc/timezone 2>/dev/null)
|
||||
if [ -n "${tz}" ]; then
|
||||
printf '%s\n' "${tz}"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
if command -v readlink >/dev/null 2>&1; then
|
||||
local link
|
||||
link=$(readlink -f /etc/localtime 2>/dev/null || true)
|
||||
if [ -n "${link}" ] && [[ "${link}" == *zoneinfo/* ]]; then
|
||||
printf '%s\n' "${link##*/zoneinfo/}"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
||||
printf '%s\n' ""
|
||||
}
|
||||
|
||||
HOST_TZ=$(detect_timezone)
|
||||
|
||||
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
|
||||
|
||||
# Run docker compose from the Docker directory so it picks up the bundled yaml.
|
||||
(
|
||||
cd "${SCRIPT_DIR}"
|
||||
LOCAL_UID="${CALLER_UID}" LOCAL_GID="${CALLER_GID}" "${COMPOSE_CMD[@]}" "$@"
|
||||
LOCAL_UID="${CALLER_UID}" LOCAL_GID="${CALLER_GID}" HOST_TZ="${HOST_TZ:-UTC}" "${COMPOSE_CMD[@]}" "$@"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user