BUGFIX: ensure a locale is set correctly

diff --git a/launcher b/launcher
index f17fc7ca743f39b69147af87f407bb5b1982a605..000641326c1de73187b7f56d2fcee3233bc800bd 100755 (executable)
--- a/launcher
+++ b/launcher
@@ -182,7 +182,8 @@ set_template_info() {
     require 'yaml'
 
     input=STDIN.readlines.join
-    env = {}
+    # default to UTF-8 for the dbs sake
+    env = {'LANG' => 'en_US.UTF-8'}
     input.split('_FILE_SEPERATOR_').each do |yml|
        yml.strip!
        begin

diff --git a/samples/data.yml b/samples/data.yml
index ebcdf34c52935267c46fd8afde5df48eb64f79d2..38ccdd4b7f4ed066efd8688df0a0420f048ed3eb 100644 (file)
--- a/samples/data.yml
+++ b/samples/data.yml
@@ -11,6 +11,10 @@ expose:
   - "6379:6379"
   - "2221:22"
 
+env:
+  # ensure locale exists in container, you may need to install it
+  LANG: en_US.UTF-8
+
 # amend SOME_SECRET to a password for the discourse user
 hooks:
   after_postgres:

diff --git a/samples/redis.yml b/samples/redis.yml
index 76105aec93d7185d77a88f08c7ea11856ee9769c..84b006eb35841efecac87e334c264261a5534c7a 100644 (file)
--- a/samples/redis.yml
+++ b/samples/redis.yml
@@ -2,6 +2,9 @@ templates:
   - "templates/redis.template.yml"
   - "templates/sshd.template.yml"
 
+env:
+  LANG: en_US.UTF-8
+
 expose:
   - "6379:6379"
   - "2221:22"

diff --git a/samples/standalone.yml b/samples/standalone.yml
index 243414cd22578a098ddc0e18661d17a43ab97cfd..a8d1e2a53bd0ca46448235ab3afa79e16c906896 100644 (file)
--- a/samples/standalone.yml
+++ b/samples/standalone.yml
@@ -23,6 +23,7 @@ params:
   version: HEAD
 
 env:
+  LANG: en_US.UTF-8
   ## How many concurrent web requests are supported?
   ## With 2GB we recommend 3-4 workers, with 1GB only 2
   # UNICORN_WORKERS: 3

diff --git a/samples/web_only.yml b/samples/web_only.yml
index 08fafcb6aaacd741a27d659afb5915611b592fd6..296ceab3a4dcdbf0306f995c83676d9e0d2f7fba 100644 (file)
--- a/samples/web_only.yml
+++ b/samples/web_only.yml
@@ -15,6 +15,8 @@ params:
 # developer emails allow you to fast track account creation on the site
 env:
   # add emails here
+  LANG: en_US.UTF-8
+
   DISCOURSE_DEVELOPER_EMAILS: ''
   DISCOURSE_DB_SOCKET: ''
   DISCOURSE_DB_PASSWORD: SOME_SECRET

diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml
index 7da562106febdc69b22566e2d9b5e9e5f1d3b130..abed0f4e98d0e2e3c7f65e0f79168158734f5fba 100644 (file)
--- a/templates/postgres.template.yml
+++ b/templates/postgres.template.yml
@@ -102,7 +102,7 @@ run:
   - exec:
       cmd:
         - chown -R root /var/lib/postgresql/9.3/main
-        - "[ ! -e /shared/postgres_data ] && install -d -m 0755 -o postgres -g postgres /shared/postgres_data && sudo -u postgres /usr/lib/postgresql/9.3/bin/initdb -D /shared/postgres_data || exit 0"
+        - "[ ! -e /shared/postgres_data ] && install -d -m 0755 -o postgres -g postgres /shared/postgres_data && sudo -E -u postgres /usr/lib/postgresql/9.3/bin/initdb -D /shared/postgres_data || exit 0"
         - chown -R postgres:postgres /shared/postgres_data
         - chown -R postgres:postgres /var/run/postgresql