Skip to content

Commit 1429bfe

Browse files
committed
Add support for locale and encoding, fix #406
1 parent 0465500 commit 1429bfe

File tree

2 files changed

+21
-2
lines changed

2 files changed

+21
-2
lines changed

src/root/usr/share/container-scripts/postgresql/README.md

+7
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ initialization by passing `-e VAR=VALUE` to the Docker run command.
7474
**`POSTGRESQL_ADMIN_PASSWORD`**
7575
Password for the `postgres` admin account (optional)
7676

77+
The following environment variables are optional, and only used when the database is initialzed
78+
79+
**`POSTGRESQL_ENCODING`**
80+
Database encoding. Default to UTF8
81+
82+
**`POSTGRESQL_LOCALE`**
83+
Database locale. Default to en_US
7784

7885
Alternatively, the following options are related to migration scenario:
7986

src/root/usr/share/container-scripts/postgresql/common.sh

+14-2
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,10 @@ initdb_wrapper ()
190190
# Initialize the database cluster with utf8 support enabled by default.
191191
# This might affect performance, see:
192192
# http://www.postgresql.org/docs/{{ spec.version }}/static/locale.html
193-
LANG=${LANG:-en_US.utf8} "$@"
193+
ENCODING=${POSTGRESQL_ENCODING:-UTF8}
194+
LOCALE=${POSTGRESQL_LOCALE:-en_US}
195+
if [ ${LOCALE} == "C" ] ; then LANG=C; fi
196+
LANG=${LANG:-$LOCALE.$ENCODING} "$@" -E $ENCODING
194197
}
195198

196199
function initialize_database() {
@@ -223,7 +226,16 @@ EOF
223226
function create_users() {
224227
if [[ ",$postinitdb_actions," = *,simple_db,* ]]; then
225228
createuser "$POSTGRESQL_USER"
226-
createdb --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
229+
230+
EXTRA_ARGS=""
231+
if [ -v POSTGRESQL_ENCODING ]; then
232+
EXTRA_ARGS="$EXTRA_ARGS -E $POSTGRESQL_ENCODING"
233+
fi
234+
if [ -v POSTGRESQL_LOCALE ]; then
235+
EXTRA_ARGS="$EXTRA_ARGS -l $POSTGRESQL_LOCALE"
236+
fi
237+
238+
createdb $EXTRA_ARGS --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
227239
fi
228240

229241
if [ -v POSTGRESQL_MASTER_USER ]; then

0 commit comments

Comments
 (0)