Skip to content

Commit 785ab38

Browse files
mscherermscherer
committed
Regenerate scripts/doc
1 parent 95707d7 commit 785ab38

File tree

17 files changed

+76
-277
lines changed

17 files changed

+76
-277
lines changed

‎12/Dockerfile.rhel8

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ FROM ubi8/s2i-core
99
# * $POSTGRESQL_DATABASE - Name of the database to create
1010
# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
1111
# PostgreSQL administrative account
12+
# * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
13+
# * $POSTGRESQL_LOCALE - Database locale. Default to en_US
1214

1315
ENV POSTGRESQL_VERSION=12 \
1416
POSTGRESQL_PREV_VERSION=10 \

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

+14-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ initdb_wrapper ()
209209
# Initialize the database cluster with utf8 support enabled by default.
210210
# This might affect performance, see:
211211
# http://www.postgresql.org/docs/12/static/locale.html
212-
LANG=${LANG:-en_US.utf8} "$@"
212+
ENCODING=${POSTGRESQL_ENCODING:-UTF8}
213+
LOCALE=${POSTGRESQL_LOCALE:-en_US}
214+
if [ ${LOCALE} == "C" ] ; then LANG=C; fi
215+
LANG=${LANG:-$LOCALE.$ENCODING} "$@" -E $ENCODING
213216
}
214217

215218
function initialize_database() {
@@ -242,7 +245,16 @@ EOF
242245
function create_users() {
243246
if [[ ",$postinitdb_actions," = *,simple_db,* ]]; then
244247
createuser "$POSTGRESQL_USER"
245-
createdb --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
248+
249+
EXTRA_ARGS=""
250+
if [ -v POSTGRESQL_ENCODING ]; then
251+
EXTRA_ARGS="$EXTRA_ARGS -E $POSTGRESQL_ENCODING"
252+
fi
253+
if [ -v POSTGRESQL_LOCALE ]; then
254+
EXTRA_ARGS="$EXTRA_ARGS -l $POSTGRESQL_LOCALE"
255+
fi
256+
257+
createdb $EXTRA_ARGS --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
246258
fi
247259

248260
if [ -v POSTGRESQL_MASTER_USER ]; then

‎13/Dockerfile.c9s

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
99
# * $POSTGRESQL_DATABASE - Name of the database to create
1010
# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
1111
# PostgreSQL administrative account
12+
# * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
13+
# * $POSTGRESQL_LOCALE - Database locale. Default to en_US
1214

1315
ENV POSTGRESQL_VERSION=13 \
1416
POSTGRESQL_PREV_VERSION=12 \

‎13/Dockerfile.rhel8

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ FROM ubi8/s2i-core
99
# * $POSTGRESQL_DATABASE - Name of the database to create
1010
# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
1111
# PostgreSQL administrative account
12+
# * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
13+
# * $POSTGRESQL_LOCALE - Database locale. Default to en_US
1214

1315
ENV POSTGRESQL_VERSION=13 \
1416
POSTGRESQL_PREV_VERSION=12 \

‎13/Dockerfile.rhel9

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ FROM ubi9/s2i-core
99
# * $POSTGRESQL_DATABASE - Name of the database to create
1010
# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
1111
# PostgreSQL administrative account
12+
# * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
13+
# * $POSTGRESQL_LOCALE - Database locale. Default to en_US
1214

1315
ENV POSTGRESQL_VERSION=13 \
1416
POSTGRESQL_PREV_VERSION=12 \

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

+14-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ initdb_wrapper ()
209209
# Initialize the database cluster with utf8 support enabled by default.
210210
# This might affect performance, see:
211211
# http://www.postgresql.org/docs/13/static/locale.html
212-
LANG=${LANG:-en_US.utf8} "$@"
212+
ENCODING=${POSTGRESQL_ENCODING:-UTF8}
213+
LOCALE=${POSTGRESQL_LOCALE:-en_US}
214+
if [ ${LOCALE} == "C" ] ; then LANG=C; fi
215+
LANG=${LANG:-$LOCALE.$ENCODING} "$@" -E $ENCODING
213216
}
214217

215218
function initialize_database() {
@@ -242,7 +245,16 @@ EOF
242245
function create_users() {
243246
if [[ ",$postinitdb_actions," = *,simple_db,* ]]; then
244247
createuser "$POSTGRESQL_USER"
245-
createdb --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
248+
249+
EXTRA_ARGS=""
250+
if [ -v POSTGRESQL_ENCODING ]; then
251+
EXTRA_ARGS="$EXTRA_ARGS -E $POSTGRESQL_ENCODING"
252+
fi
253+
if [ -v POSTGRESQL_LOCALE ]; then
254+
EXTRA_ARGS="$EXTRA_ARGS -l $POSTGRESQL_LOCALE"
255+
fi
256+
257+
createdb $EXTRA_ARGS --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
246258
fi
247259

248260
if [ -v POSTGRESQL_MASTER_USER ]; then

‎15/Dockerfile.c9s

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
99
# * $POSTGRESQL_DATABASE - Name of the database to create
1010
# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
1111
# PostgreSQL administrative account
12+
# * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
13+
# * $POSTGRESQL_LOCALE - Database locale. Default to en_US
1214

1315
ENV POSTGRESQL_VERSION=15 \
1416
POSTGRESQL_PREV_VERSION=13 \

‎15/Dockerfile.fedora

-89
This file was deleted.

‎15/Dockerfile.rhel8

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ FROM ubi8/s2i-core
99
# * $POSTGRESQL_DATABASE - Name of the database to create
1010
# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
1111
# PostgreSQL administrative account
12+
# * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
13+
# * $POSTGRESQL_LOCALE - Database locale. Default to en_US
1214

1315
ENV POSTGRESQL_VERSION=15 \
1416
POSTGRESQL_PREV_VERSION=13 \

‎15/Dockerfile.rhel9

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ FROM ubi9/s2i-core
99
# * $POSTGRESQL_DATABASE - Name of the database to create
1010
# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
1111
# PostgreSQL administrative account
12+
# * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
13+
# * $POSTGRESQL_LOCALE - Database locale. Default to en_US
1214

1315
ENV POSTGRESQL_VERSION=15 \
1416
POSTGRESQL_PREV_VERSION=13 \

‎15/root/usr/share/container-scripts/postgresql/common.sh

+14-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ initdb_wrapper ()
209209
# Initialize the database cluster with utf8 support enabled by default.
210210
# This might affect performance, see:
211211
# http://www.postgresql.org/docs/15/static/locale.html
212-
LANG=${LANG:-en_US.utf8} "$@"
212+
ENCODING=${POSTGRESQL_ENCODING:-UTF8}
213+
LOCALE=${POSTGRESQL_LOCALE:-en_US}
214+
if [ ${LOCALE} == "C" ] ; then LANG=C; fi
215+
LANG=${LANG:-$LOCALE.$ENCODING} "$@" -E $ENCODING
213216
}
214217

215218
function initialize_database() {
@@ -242,7 +245,16 @@ EOF
242245
function create_users() {
243246
if [[ ",$postinitdb_actions," = *,simple_db,* ]]; then
244247
createuser "$POSTGRESQL_USER"
245-
createdb --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
248+
249+
EXTRA_ARGS=""
250+
if [ -v POSTGRESQL_ENCODING ]; then
251+
EXTRA_ARGS="$EXTRA_ARGS -E $POSTGRESQL_ENCODING"
252+
fi
253+
if [ -v POSTGRESQL_LOCALE ]; then
254+
EXTRA_ARGS="$EXTRA_ARGS -l $POSTGRESQL_LOCALE"
255+
fi
256+
257+
createdb $EXTRA_ARGS --owner="$POSTGRESQL_USER" "$POSTGRESQL_DATABASE"
246258
fi
247259

248260
if [ -v POSTGRESQL_MASTER_USER ]; then

‎16/Dockerfile.c10s

-90
This file was deleted.

‎16/Dockerfile.c9s

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ FROM quay.io/sclorg/s2i-core-c9s:c9s
99
# * $POSTGRESQL_DATABASE - Name of the database to create
1010
# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres'
1111
# PostgreSQL administrative account
12+
# * $POSTGRESQL_ENCODING - Database encoding. Default to UTF8
13+
# * $POSTGRESQL_LOCALE - Database locale. Default to en_US
1214

1315
ENV POSTGRESQL_VERSION=16 \
1416
POSTGRESQL_PREV_VERSION=15 \

0 commit comments

Comments
 (0)