Merge branch 'jp-locales' into 'master'

Use C.UTF-8

See merge request gitlab-org/gitlab-build-images!451
This commit is contained in:
Rémy Coutable 2021-12-13 10:31:08 +00:00
commit 58a310f6ce
17 changed files with 60 additions and 64 deletions

View file

@ -37,10 +37,10 @@ fi
# Set UTF-8
# http://stackoverflow.com/a/3182519/2137281
LOC=$'LC_ALL=en_US.UTF-8\nLANG=en_US.UTF-8'
LOC=$'LC_ALL=C.UTF-8\nLANG=C.UTF-8'
echo "$LOC" > /etc/environment
cat /etc/environment
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
echo "C.UTF-8 UTF-8" > /etc/locale.gen
locale-gen
dpkg-reconfigure locales -f noninteractive -p critical
locale -a

View file

@ -36,9 +36,9 @@ mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper
chmod +x /usr/bin/gitlab-runner-helper
# Set UTF-8
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
echo "C.UTF-8 UTF-8" > /etc/locale.gen
locale-gen
update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 LC_ALL=en_US.UTF-8
update-locale LANG=C.UTF-8 LC_CTYPE=C.UTF-8 LC_ALL=C.UTF-8
locale -a
# Clean up