From efe59292d9f44ede14cd138689e20c05a0a29879 Mon Sep 17 00:00:00 2001 From: Juanma Date: Wed, 13 Dec 2017 11:52:46 +0100 Subject: [PATCH 1/2] Support to be able to change the language of the database --- 9.6/Dockerfile | 5 +++-- 9.6/docker-entrypoint.sh | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 644953e10c..815957d3e2 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -28,10 +28,11 @@ RUN set -x \ && gosu nobody true \ && apt-get purge -y --auto-remove ca-certificates wget +ENV LANG en_US.utf8 +ENV LANGUAGE en_US # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \ - && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG en_US.utf8 + && localedef -i $LANGUAGE -c -f UTF-8 -A /usr/share/locale/locale.alias $LANG RUN mkdir /docker-entrypoint-initdb.d diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh index c96fea538d..3aea4ecc31 100755 --- a/9.6/docker-entrypoint.sh +++ b/9.6/docker-entrypoint.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -e +localedef -i $LANGUAGE -c -f UTF-8 -A /usr/share/locale/locale.alias $LANG + # usage: file_env VAR [DEFAULT] # ie: file_env 'XYZ_DB_PASSWORD' 'example' # (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of From c24b97cfbfa6685880cd6e2a5293072c28590783 Mon Sep 17 00:00:00 2001 From: Juanma Date: Wed, 13 Dec 2017 15:34:58 +0100 Subject: [PATCH 2/2] Language selection fix --- 9.6/docker-entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh index 3aea4ecc31..5caa2ada6d 100755 --- a/9.6/docker-entrypoint.sh +++ b/9.6/docker-entrypoint.sh @@ -1,8 +1,6 @@ #!/usr/bin/env bash set -e -localedef -i $LANGUAGE -c -f UTF-8 -A /usr/share/locale/locale.alias $LANG - # usage: file_env VAR [DEFAULT] # ie: file_env 'XYZ_DB_PASSWORD' 'example' # (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of @@ -46,6 +44,7 @@ if [ "$1" = 'postgres' ] && [ "$(id -u)" = '0' ]; then chmod 700 "$POSTGRES_INITDB_XLOGDIR" fi + localedef -i $LANGUAGE -c -f UTF-8 -A /usr/share/locale/locale.alias $LANG exec gosu postgres "$BASH_SOURCE" "$@" fi