Skip to content

fix(docker): restore timezone-based CN geo detection #15772

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

Open
YuqiHuai wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −11
Open

fix(docker): restore timezone-based CN geo detection #15772

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions docker/scripts/dev_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,17 +276,15 @@ function check_target_arch() {

function check_timezone_cn() {
# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# time_zone=$(timedatectl | grep "Time zone" | xargs)
# time_zone=$(date +"%z")

# for tz in "${TIMEZONE_CN[@]}"; do
# if [[ "${time_zone}" == "${tz}" ]]; then
# GEOLOC="cn"
# return 0
# fi
# done
# disable docker.io image source
GEOLOC="cn"
time_zone=$(timedatectl | grep "Time zone" | xargs)
time_zone=$(date +"%z")

for tz in "${TIMEZONE_CN[@]}"; do
if [[ "${time_zone}" == "${tz}" ]]; then
GEOLOC="cn"
return 0
fi
done
}

function setup_devices_and_mount_local_volumes() {
Expand Down