From a4b6986b5f32030778ad30eb33284b9035cb6ad2 Mon Sep 17 00:00:00 2001 From: YAEGASHI Takeshi Date: Sat, 16 May 2020 23:39:15 +0900 Subject: [PATCH] Ensure it overrides all locale related variables LC_ALL, LANG and LANGUAGE are set to en_US.UTF-8 in the docker image. The config should override all of them when other locale is needed. Otherwise it fails to create a DB with the proper locale setting. --- samples/data.yml | 2 ++ samples/mail-receiver.yml | 2 ++ samples/redis.yml | 2 ++ samples/standalone.yml | 2 ++ samples/web_only.yml | 2 ++ 5 files changed, 10 insertions(+) diff --git a/samples/data.yml b/samples/data.yml index 9f626ce..2ecb61a 100644 --- a/samples/data.yml +++ b/samples/data.yml @@ -21,7 +21,9 @@ params: env: # ensure locale exists in container, you may need to install it + LC_ALL: en_US.UTF-8 LANG: en_US.UTF-8 + LANGUAGE: en_US.UTF-8 volumes: - volume: diff --git a/samples/mail-receiver.yml b/samples/mail-receiver.yml index bd7859e..1a3d11b 100644 --- a/samples/mail-receiver.yml +++ b/samples/mail-receiver.yml @@ -14,7 +14,9 @@ expose: - "25:25" # SMTP env: + LC_ALL: en_US.UTF-8 LANG: en_US.UTF-8 + LANGUAGE: en_US.UTF-8 ## Where e-mail to your forum should be sent. In general, it's perfectly fine ## to use the same domain as the forum itself here. diff --git a/samples/redis.yml b/samples/redis.yml index 4086008..ce0bf05 100644 --- a/samples/redis.yml +++ b/samples/redis.yml @@ -2,7 +2,9 @@ templates: - "templates/redis.template.yml" env: + LC_ALL: en_US.UTF-8 LANG: en_US.UTF-8 + LANGUAGE: en_US.UTF-8 # any extra arguments for Docker? # docker_args: diff --git a/samples/standalone.yml b/samples/standalone.yml index f830dda..77a37a1 100644 --- a/samples/standalone.yml +++ b/samples/standalone.yml @@ -37,7 +37,9 @@ params: #version: tests-passed env: + LC_ALL: en_US.UTF-8 LANG: en_US.UTF-8 + LANGUAGE: en_US.UTF-8 # DISCOURSE_DEFAULT_LOCALE: en ## How many concurrent web requests are supported? Depends on memory and CPU cores. diff --git a/samples/web_only.yml b/samples/web_only.yml index f48ed2d..c2b21df 100644 --- a/samples/web_only.yml +++ b/samples/web_only.yml @@ -29,7 +29,9 @@ params: #version: tests-passed env: + LC_ALL: en_US.UTF-8 LANG: en_US.UTF-8 + LANGUAGE: en_US.UTF-8 # DISCOURSE_DEFAULT_LOCALE: en ## How many concurrent web requests are supported? Depends on memory and CPU cores. -- 2.25.1