Regenerate scripts/doc

Author: mscherer

12/Dockerfile.rhel8

@@ -9,6 +9,8 @@ FROM ubi8/s2i-core
 #  * $POSTGRESQL_DATABASE - Name of the database to create
 #  * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
 #                           PostgreSQL administrative account
+#  * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
+#  * $POSTGRESQL_LOCALE   - Database locale. Default to en_US
 
 ENV POSTGRESQL_VERSION=12 \
     POSTGRESQL_PREV_VERSION=10 \

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

@@ -209,7 +209,10 @@ initdb_wrapper ()
   # Initialize the database cluster with utf8 support enabled by default.
   # This might affect performance, see:
   # http://www.postgresql.org/docs/12/static/locale.html
-  LANG=${LANG:-en_US.utf8} "$@"
+  ENCODING=${POSTGRESQL_ENCODING:-UTF8}
+  LOCALE=${POSTGRESQL_LOCALE:-en_US}
+  if [ ${LOCALE} == "C" ] ; then LANG=C; fi
+  LANG=${LANG:-$LOCALE.$ENCODING} "$@" -E $ENCODING
 }
 
 function initialize_database() {
@@ -242,7 +245,16 @@ EOF
 function create_users() {
   if [[ ",$postinitdb_actions," = *,simple_db,* ]]; then
     createuser "$POSTGRESQL_USER"
-    createdb --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
+
+    EXTRA_ARGS=""
+    if [ -v POSTGRESQL_ENCODING ]; then
+       EXTRA_ARGS="$EXTRA_ARGS -E $POSTGRESQL_ENCODING"
+    fi
+    if [ -v POSTGRESQL_LOCALE ]; then
+       EXTRA_ARGS="$EXTRA_ARGS -l $POSTGRESQL_LOCALE"
+    fi
+
+    createdb $EXTRA_ARGS --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
   fi
 
   if [ -v POSTGRESQL_MASTER_USER ]; then

13/Dockerfile.c9s

@@ -9,6 +9,8 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
 #  * $POSTGRESQL_DATABASE - Name of the database to create
 #  * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
 #                           PostgreSQL administrative account
+#  * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
+#  * $POSTGRESQL_LOCALE   - Database locale. Default to en_US
 
 ENV POSTGRESQL_VERSION=13 \
     POSTGRESQL_PREV_VERSION=12 \

13/Dockerfile.rhel8

@@ -9,6 +9,8 @@ FROM ubi8/s2i-core
 #  * $POSTGRESQL_DATABASE - Name of the database to create
 #  * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
 #                           PostgreSQL administrative account
+#  * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
+#  * $POSTGRESQL_LOCALE   - Database locale. Default to en_US
 
 ENV POSTGRESQL_VERSION=13 \
     POSTGRESQL_PREV_VERSION=12 \

13/Dockerfile.rhel9

@@ -9,6 +9,8 @@ FROM ubi9/s2i-core
 #  * $POSTGRESQL_DATABASE - Name of the database to create
 #  * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
 #                           PostgreSQL administrative account
+#  * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
+#  * $POSTGRESQL_LOCALE   - Database locale. Default to en_US
 
 ENV POSTGRESQL_VERSION=13 \
     POSTGRESQL_PREV_VERSION=12 \

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

@@ -209,7 +209,10 @@ initdb_wrapper ()
   # Initialize the database cluster with utf8 support enabled by default.
   # This might affect performance, see:
   # http://www.postgresql.org/docs/13/static/locale.html
-  LANG=${LANG:-en_US.utf8} "$@"
+  ENCODING=${POSTGRESQL_ENCODING:-UTF8}
+  LOCALE=${POSTGRESQL_LOCALE:-en_US}
+  if [ ${LOCALE} == "C" ] ; then LANG=C; fi
+  LANG=${LANG:-$LOCALE.$ENCODING} "$@" -E $ENCODING
 }
 
 function initialize_database() {
@@ -242,7 +245,16 @@ EOF
 function create_users() {
   if [[ ",$postinitdb_actions," = *,simple_db,* ]]; then
     createuser "$POSTGRESQL_USER"
-    createdb --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
+
+    EXTRA_ARGS=""
+    if [ -v POSTGRESQL_ENCODING ]; then
+       EXTRA_ARGS="$EXTRA_ARGS -E $POSTGRESQL_ENCODING"
+    fi
+    if [ -v POSTGRESQL_LOCALE ]; then
+       EXTRA_ARGS="$EXTRA_ARGS -l $POSTGRESQL_LOCALE"
+    fi
+
+    createdb $EXTRA_ARGS --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
   fi
 
   if [ -v POSTGRESQL_MASTER_USER ]; then

15/Dockerfile.c9s

@@ -9,6 +9,8 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
 #  * $POSTGRESQL_DATABASE - Name of the database to create
 #  * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
 #                           PostgreSQL administrative account
+#  * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
+#  * $POSTGRESQL_LOCALE   - Database locale. Default to en_US
 
 ENV POSTGRESQL_VERSION=15 \
     POSTGRESQL_PREV_VERSION=13 \

15/Dockerfile.fedora

@@ -9,6 +9,8 @@ FROM ubi8/s2i-core
 #  * $POSTGRESQL_DATABASE - Name of the database to create
 #  * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
 #                           PostgreSQL administrative account
+#  * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
+#  * $POSTGRESQL_LOCALE   - Database locale. Default to en_US
 
 ENV POSTGRESQL_VERSION=15 \
     POSTGRESQL_PREV_VERSION=13 \

15/Dockerfile.rhel8

@@ -9,6 +9,8 @@ FROM ubi9/s2i-core
 #  * $POSTGRESQL_DATABASE - Name of the database to create
 #  * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
 #                           PostgreSQL administrative account
+#  * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
+#  * $POSTGRESQL_LOCALE   - Database locale. Default to en_US
 
 ENV POSTGRESQL_VERSION=15 \
     POSTGRESQL_PREV_VERSION=13 \