From 4736aa017549e0808066aa9b7c2c788b9b93ce86 Mon Sep 17 00:00:00 2001
From: Timur Isanov <xtimon@yahoo.com>
Date: Tue, 20 Dec 2016 11:58:52 +0300
Subject: [PATCH 1/7] multiple users and databases

---
 docker-entrypoint.sh | 76 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 4 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 54a1098f7a..5a194cb8d5 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "gosu postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in

From 239bb255f2e62832c1fa34845e4da107f58efc96 Mon Sep 17 00:00:00 2001
From: Timur Isanov <xtimon@yahoo.com>
Date: Tue, 20 Dec 2016 12:14:48 +0300
Subject: [PATCH 2/7] update settings

---
 9.2/alpine/docker-entrypoint.sh | 76 +++++++++++++++++++++++++++++++--
 9.2/docker-entrypoint.sh        | 76 +++++++++++++++++++++++++++++++--
 9.3/alpine/docker-entrypoint.sh | 76 +++++++++++++++++++++++++++++++--
 9.3/docker-entrypoint.sh        | 76 +++++++++++++++++++++++++++++++--
 9.4/alpine/docker-entrypoint.sh | 76 +++++++++++++++++++++++++++++++--
 9.4/docker-entrypoint.sh        | 76 +++++++++++++++++++++++++++++++--
 9.5/alpine/docker-entrypoint.sh | 76 +++++++++++++++++++++++++++++++--
 9.5/docker-entrypoint.sh        | 76 +++++++++++++++++++++++++++++++--
 9.6/alpine/docker-entrypoint.sh | 76 +++++++++++++++++++++++++++++++--
 9.6/docker-entrypoint.sh        | 76 +++++++++++++++++++++++++++++++--
 10 files changed, 720 insertions(+), 40 deletions(-)

diff --git a/9.2/alpine/docker-entrypoint.sh b/9.2/alpine/docker-entrypoint.sh
index 2c87e77fb1..a742240286 100755
--- a/9.2/alpine/docker-entrypoint.sh
+++ b/9.2/alpine/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "su-exec postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | su-exec postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh
index 54a1098f7a..5a194cb8d5 100755
--- a/9.2/docker-entrypoint.sh
+++ b/9.2/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "gosu postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh
index 2c87e77fb1..a742240286 100755
--- a/9.3/alpine/docker-entrypoint.sh
+++ b/9.3/alpine/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "su-exec postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | su-exec postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
index 54a1098f7a..5a194cb8d5 100755
--- a/9.3/docker-entrypoint.sh
+++ b/9.3/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "gosu postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh
index 2c87e77fb1..a742240286 100755
--- a/9.4/alpine/docker-entrypoint.sh
+++ b/9.4/alpine/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "su-exec postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | su-exec postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index 54a1098f7a..5a194cb8d5 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "gosu postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh
index 2c87e77fb1..a742240286 100755
--- a/9.5/alpine/docker-entrypoint.sh
+++ b/9.5/alpine/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "su-exec postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | su-exec postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index 54a1098f7a..5a194cb8d5 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "gosu postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh
index 2c87e77fb1..a742240286 100755
--- a/9.6/alpine/docker-entrypoint.sh
+++ b/9.6/alpine/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "su-exec postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | su-exec postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
index 54a1098f7a..5a194cb8d5 100755
--- a/9.6/docker-entrypoint.sh
+++ b/9.6/docker-entrypoint.sh
@@ -41,6 +41,17 @@ if [ "$1" = 'postgres' ]; then
 		file_env 'POSTGRES_INITDB_ARGS'
 		eval "gosu postgres initdb $POSTGRES_INITDB_ARGS"
 
+		authMethod=trust
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_PASSWORD" ]; then
+					authMethod=md5
+			done
+		fi
+
 		# check password first so we can output the warning before postgres
 		# messes it up
 		file_env 'POSTGRES_PASSWORD'
@@ -48,7 +59,10 @@ if [ "$1" = 'postgres' ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"
 			authMethod=md5
 		else
-			# The - option suppresses leading tabs but *not* spaces. :)
+			pass=
+		fi
+
+		if [ "$authMethod" == "trust" ]; then
 			cat >&2 <<-'EOWARN'
 				****************************************************
 				WARNING: No password has been set for the database.
@@ -62,9 +76,6 @@ if [ "$1" = 'postgres' ]; then
 				         it in "docker run".
 				****************************************************
 			EOWARN
-
-			pass=
-			authMethod=trust
 		fi
 
 		{ echo; echo "host all all all $authMethod"; } | gosu postgres tee -a "$PGDATA/pg_hba.conf" > /dev/null
@@ -99,6 +110,63 @@ if [ "$1" = 'postgres' ]; then
 
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
+		# If you want to create more than one user, please use that variable
+		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		if [ "$POSTGRES_USERS" ]; then
+			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
+			for USER in $USERS_ARR
+			do
+				USER_NAME=`echo $USER | cut -d: -f1`
+				USER_PASSWORD=`echo $USER | cut -d: -f2`
+				if [ "$USER_NAME" = 'postgres' ]; then
+					op='ALTER'
+				else
+					op='CREATE'
+				fi
+				"${psql[@]}" --username postgres <<-EOSQL
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+				EOSQL
+			done
+		fi
+
+		# If you want to create more than one database, please use that variable
+		# Variable example: POSTGRES_DATABASES="database1:user1|database2:user2|database3:user3"
+		if [ "$POSTGRES_DATABASES" ]; then
+			DATABASES_ARR=$(echo $POSTGRES_DATABASES | tr "|" "\n")
+			for DATABASE in $DATABASES_ARR
+			do
+				DATABASE_NAME=`echo $DATABASE | cut -d: -f1`
+				DATABASE_OWNER=`echo $DATABASE | cut -d: -f2`
+				if [ "$DATABASE_NAME" != 'postgres' ]; then
+					if [ "$DATABASE_OWNER" ]; then
+						"${psql[@]}" --username postgres <<-EOSQL
+						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						EOSQL
+						echo
+					else
+						"${psql[@]}" --username postgres <<-EOSQL
+							CREATE DATABASE "$DATABASE_NAME" ;
+						EOSQL
+						echo
+					fi
+				fi
+			done
+		fi
+
+		# If you want to set up initial postgresql.conf parameters, please use that variable
+		# Variable example: POSTGRES_CONFIGS="work_mem:15MB|fsync:off|full_page_writes:off"
+		if [ "$POSTGRES_CONFIGS" ]; then
+			CONFIGS_ARR=$(echo $POSTGRES_CONFIGS | tr "|" "\n")
+			for CONFIG in $CONFIGS_ARR
+			do
+				CONFIG_NAME=`echo $CONFIG | cut -d: -f1`
+				CONFIG_VALUE=`echo $CONFIG | cut -d: -f2`
+				"${psql[@]}" --username postgres <<-EOSQL
+					ALTER SYSTEM SET $CONFIG_NAME = "$CONFIG_VALUE" ;
+				EOSQL
+			done
+		fi
+
 		echo
 		for f in /docker-entrypoint-initdb.d/*; do
 			case "$f" in

From c6aabbe66e9af3fd5683c7065bab93d9df8855ef Mon Sep 17 00:00:00 2001
From: Timur Isanov <xtimon@yahoo.com>
Date: Tue, 20 Dec 2016 12:31:59 +0300
Subject: [PATCH 3/7] fix

---
 9.2/alpine/docker-entrypoint.sh | 1 +
 9.2/docker-entrypoint.sh        | 1 +
 9.3/alpine/docker-entrypoint.sh | 1 +
 9.3/docker-entrypoint.sh        | 1 +
 9.4/alpine/docker-entrypoint.sh | 1 +
 9.4/docker-entrypoint.sh        | 1 +
 9.5/alpine/docker-entrypoint.sh | 1 +
 9.5/docker-entrypoint.sh        | 1 +
 9.6/alpine/docker-entrypoint.sh | 1 +
 9.6/docker-entrypoint.sh        | 1 +
 docker-entrypoint.sh            | 1 +
 11 files changed, 11 insertions(+)

diff --git a/9.2/alpine/docker-entrypoint.sh b/9.2/alpine/docker-entrypoint.sh
index a742240286..fd2bacf6da 100755
--- a/9.2/alpine/docker-entrypoint.sh
+++ b/9.2/alpine/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh
index 5a194cb8d5..e6b700c2a5 100755
--- a/9.2/docker-entrypoint.sh
+++ b/9.2/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh
index a742240286..fd2bacf6da 100755
--- a/9.3/alpine/docker-entrypoint.sh
+++ b/9.3/alpine/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
index 5a194cb8d5..e6b700c2a5 100755
--- a/9.3/docker-entrypoint.sh
+++ b/9.3/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh
index a742240286..fd2bacf6da 100755
--- a/9.4/alpine/docker-entrypoint.sh
+++ b/9.4/alpine/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index 5a194cb8d5..e6b700c2a5 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh
index a742240286..fd2bacf6da 100755
--- a/9.5/alpine/docker-entrypoint.sh
+++ b/9.5/alpine/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index 5a194cb8d5..e6b700c2a5 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh
index a742240286..fd2bacf6da 100755
--- a/9.6/alpine/docker-entrypoint.sh
+++ b/9.6/alpine/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
index 5a194cb8d5..e6b700c2a5 100755
--- a/9.6/docker-entrypoint.sh
+++ b/9.6/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 5a194cb8d5..e6b700c2a5 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -49,6 +49,7 @@ if [ "$1" = 'postgres' ]; then
 				USER_PASSWORD=`echo $USER | cut -d: -f2`
 				if [ "$USER_PASSWORD" ]; then
 					authMethod=md5
+				fi
 			done
 		fi
 

From d68f30558ae3dae8b46b15f53b2e0c2bd1750552 Mon Sep 17 00:00:00 2001
From: Timur Isanov <xtimon@yahoo.com>
Date: Tue, 20 Dec 2016 12:55:42 +0300
Subject: [PATCH 4/7] user password quotes

---
 9.2/alpine/docker-entrypoint.sh | 4 ++--
 9.2/docker-entrypoint.sh        | 4 ++--
 9.3/alpine/docker-entrypoint.sh | 4 ++--
 9.3/docker-entrypoint.sh        | 4 ++--
 9.4/alpine/docker-entrypoint.sh | 4 ++--
 9.4/docker-entrypoint.sh        | 4 ++--
 9.5/alpine/docker-entrypoint.sh | 4 ++--
 9.5/docker-entrypoint.sh        | 4 ++--
 9.6/alpine/docker-entrypoint.sh | 4 ++--
 9.6/docker-entrypoint.sh        | 4 ++--
 docker-entrypoint.sh            | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/9.2/alpine/docker-entrypoint.sh b/9.2/alpine/docker-entrypoint.sh
index fd2bacf6da..fa9ccc47a3 100755
--- a/9.2/alpine/docker-entrypoint.sh
+++ b/9.2/alpine/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh
index e6b700c2a5..bc52c42c2d 100755
--- a/9.2/docker-entrypoint.sh
+++ b/9.2/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh
index fd2bacf6da..fa9ccc47a3 100755
--- a/9.3/alpine/docker-entrypoint.sh
+++ b/9.3/alpine/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
index e6b700c2a5..bc52c42c2d 100755
--- a/9.3/docker-entrypoint.sh
+++ b/9.3/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh
index fd2bacf6da..fa9ccc47a3 100755
--- a/9.4/alpine/docker-entrypoint.sh
+++ b/9.4/alpine/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index e6b700c2a5..bc52c42c2d 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh
index fd2bacf6da..fa9ccc47a3 100755
--- a/9.5/alpine/docker-entrypoint.sh
+++ b/9.5/alpine/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index e6b700c2a5..bc52c42c2d 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh
index fd2bacf6da..fa9ccc47a3 100755
--- a/9.6/alpine/docker-entrypoint.sh
+++ b/9.6/alpine/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
index e6b700c2a5..bc52c42c2d 100755
--- a/9.6/docker-entrypoint.sh
+++ b/9.6/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index e6b700c2a5..bc52c42c2d 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -112,7 +112,7 @@ if [ "$1" = 'postgres' ]; then
 		psql+=( --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" )
 
 		# If you want to create more than one user, please use that variable
-		# Variable example: POSTGRES_USER="user1:user1pass|user2:user2pass|user3:user3password"
+		# Variable example: POSTGRES_USERS="user1:user1pass|user2:user2pass|user3:user3password"
 		if [ "$POSTGRES_USERS" ]; then
 			USERS_ARR=$(echo $POSTGRES_USERS | tr "|" "\n")
 			for USER in $USERS_ARR
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD $USER_PASSWORD ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
 				EOSQL
 			done
 		fi

From 1c616c203bee87d83f672cda3b5317a575fb7cf7 Mon Sep 17 00:00:00 2001
From: Timur Isanov <xtimon@yahoo.com>
Date: Tue, 20 Dec 2016 12:59:19 +0300
Subject: [PATCH 5/7] user password quotes

---
 9.2/alpine/docker-entrypoint.sh | 2 +-
 9.2/docker-entrypoint.sh        | 2 +-
 9.3/alpine/docker-entrypoint.sh | 2 +-
 9.3/docker-entrypoint.sh        | 2 +-
 9.4/alpine/docker-entrypoint.sh | 2 +-
 9.4/docker-entrypoint.sh        | 2 +-
 9.5/alpine/docker-entrypoint.sh | 2 +-
 9.5/docker-entrypoint.sh        | 2 +-
 9.6/alpine/docker-entrypoint.sh | 2 +-
 9.6/docker-entrypoint.sh        | 2 +-
 docker-entrypoint.sh            | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/9.2/alpine/docker-entrypoint.sh b/9.2/alpine/docker-entrypoint.sh
index fa9ccc47a3..5ced520803 100755
--- a/9.2/alpine/docker-entrypoint.sh
+++ b/9.2/alpine/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh
index bc52c42c2d..8026d16405 100755
--- a/9.2/docker-entrypoint.sh
+++ b/9.2/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh
index fa9ccc47a3..5ced520803 100755
--- a/9.3/alpine/docker-entrypoint.sh
+++ b/9.3/alpine/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
index bc52c42c2d..8026d16405 100755
--- a/9.3/docker-entrypoint.sh
+++ b/9.3/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh
index fa9ccc47a3..5ced520803 100755
--- a/9.4/alpine/docker-entrypoint.sh
+++ b/9.4/alpine/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index bc52c42c2d..8026d16405 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh
index fa9ccc47a3..5ced520803 100755
--- a/9.5/alpine/docker-entrypoint.sh
+++ b/9.5/alpine/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index bc52c42c2d..8026d16405 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh
index fa9ccc47a3..5ced520803 100755
--- a/9.6/alpine/docker-entrypoint.sh
+++ b/9.6/alpine/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
index bc52c42c2d..8026d16405 100755
--- a/9.6/docker-entrypoint.sh
+++ b/9.6/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index bc52c42c2d..8026d16405 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -125,7 +125,7 @@ if [ "$1" = 'postgres' ]; then
 					op='CREATE'
 				fi
 				"${psql[@]}" --username postgres <<-EOSQL
-					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD "$USER_PASSWORD" ;
+					$op USER "$USER_NAME" WITH SUPERUSER PASSWORD '$USER_PASSWORD' ;
 				EOSQL
 			done
 		fi

From ccdfdf68dbd9eb58b3bc558804b8a81372e75bef Mon Sep 17 00:00:00 2001
From: Timur Isanov <xtimon@yahoo.com>
Date: Tue, 20 Dec 2016 13:04:12 +0300
Subject: [PATCH 6/7] fix databases creation

---
 docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8026d16405..d7a78cbbb9 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else

From 1e303b18d1db3e4c2a0a6f5dd5c97c996fd18a64 Mon Sep 17 00:00:00 2001
From: Timur Isanov <xtimon@yahoo.com>
Date: Tue, 20 Dec 2016 13:06:02 +0300
Subject: [PATCH 7/7] update.sh

---
 9.2/alpine/docker-entrypoint.sh | 2 +-
 9.2/docker-entrypoint.sh        | 2 +-
 9.3/alpine/docker-entrypoint.sh | 2 +-
 9.3/docker-entrypoint.sh        | 2 +-
 9.4/alpine/docker-entrypoint.sh | 2 +-
 9.4/docker-entrypoint.sh        | 2 +-
 9.5/alpine/docker-entrypoint.sh | 2 +-
 9.5/docker-entrypoint.sh        | 2 +-
 9.6/alpine/docker-entrypoint.sh | 2 +-
 9.6/docker-entrypoint.sh        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/9.2/alpine/docker-entrypoint.sh b/9.2/alpine/docker-entrypoint.sh
index 5ced520803..e2a6cfd384 100755
--- a/9.2/alpine/docker-entrypoint.sh
+++ b/9.2/alpine/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.2/docker-entrypoint.sh b/9.2/docker-entrypoint.sh
index 8026d16405..d7a78cbbb9 100755
--- a/9.2/docker-entrypoint.sh
+++ b/9.2/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.3/alpine/docker-entrypoint.sh b/9.3/alpine/docker-entrypoint.sh
index 5ced520803..e2a6cfd384 100755
--- a/9.3/alpine/docker-entrypoint.sh
+++ b/9.3/alpine/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.3/docker-entrypoint.sh b/9.3/docker-entrypoint.sh
index 8026d16405..d7a78cbbb9 100755
--- a/9.3/docker-entrypoint.sh
+++ b/9.3/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.4/alpine/docker-entrypoint.sh b/9.4/alpine/docker-entrypoint.sh
index 5ced520803..e2a6cfd384 100755
--- a/9.4/alpine/docker-entrypoint.sh
+++ b/9.4/alpine/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.4/docker-entrypoint.sh b/9.4/docker-entrypoint.sh
index 8026d16405..d7a78cbbb9 100755
--- a/9.4/docker-entrypoint.sh
+++ b/9.4/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.5/alpine/docker-entrypoint.sh b/9.5/alpine/docker-entrypoint.sh
index 5ced520803..e2a6cfd384 100755
--- a/9.5/alpine/docker-entrypoint.sh
+++ b/9.5/alpine/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.5/docker-entrypoint.sh b/9.5/docker-entrypoint.sh
index 8026d16405..d7a78cbbb9 100755
--- a/9.5/docker-entrypoint.sh
+++ b/9.5/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.6/alpine/docker-entrypoint.sh b/9.6/alpine/docker-entrypoint.sh
index 5ced520803..e2a6cfd384 100755
--- a/9.6/alpine/docker-entrypoint.sh
+++ b/9.6/alpine/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
index 8026d16405..d7a78cbbb9 100755
--- a/9.6/docker-entrypoint.sh
+++ b/9.6/docker-entrypoint.sh
@@ -141,7 +141,7 @@ if [ "$1" = 'postgres' ]; then
 				if [ "$DATABASE_NAME" != 'postgres' ]; then
 					if [ "$DATABASE_OWNER" ]; then
 						"${psql[@]}" --username postgres <<-EOSQL
-						CREATE DATABASE "$DATABASE_NAME owner $DATABASE_OWNER" ;
+						CREATE DATABASE "$DATABASE_NAME" owner "$DATABASE_OWNER" ;
 						EOSQL
 						echo
 					else