Resync function interfaces with MySQL

Author: yosifkit

docker-entrypoint.sh

@@ -56,6 +56,7 @@ docker_create_db_directories() {
 }
 
 # initialize empty PGDATA directory with new database via 'initdb'
+# arguments to `initdb` can be passed via POSTGRES_INITDB_ARGS or as arguments to this function
 docker_init_database_dir() {
 	# "initdb" is particular about the current user existing in "/etc/passwd", so we use "nss_wrapper" to fake that if necessary
 	# see https://github.com/docker-library/postgres/pull/253, https://github.com/docker-library/postgres/issues/359, https://cwrap.org/nss_wrapper.html
@@ -69,10 +70,10 @@ docker_init_database_dir() {
 
 	file_env 'POSTGRES_INITDB_ARGS'
 	if [ "$POSTGRES_INITDB_WALDIR" ]; then
-		export POSTGRES_INITDB_ARGS="$POSTGRES_INITDB_ARGS --waldir $POSTGRES_INITDB_WALDIR"
+		set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@"
 	fi
 
-	eval 'initdb --username="$POSTGRES_USER" --pwfile=<(echo "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"
+	eval 'initdb --username="$POSTGRES_USER" --pwfile=<(echo "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
 
 	# unset/cleanup "nss_wrapper" bits
 	if [ "${LD_PRELOAD:-}" = '/usr/lib/libnss_wrapper.so' ]; then
@@ -116,15 +117,16 @@ docker_verify_minimum_env() {
 	fi
 }
 
-# run, source, or read files from /docker-entrypoint-initdb.d (or specified directory)
+# usage: docker_process_init_files [file [file [...]]]
+#    ie: docker_process_init_files /always-initdb.d/*
+# process initializer files, based on file extensions and permissions
 docker_process_init_files() {
 	# psql here for backwards compatiblilty "${psql[@]}"
 	psql=( docker_process_sql )
 
-	local initDir="${1:-/docker-entrypoint-initdb.d}"
-
 	echo
-	for f in "${initDir%/}"/*; do
+	local f
+	for f; do
 		case "$f" in
 			*.sh)
 				# https://github.com/docker-library/postgres/issues/450#issuecomment-393167936
@@ -192,6 +194,9 @@ pg_setup_hba_conf() {
 # start socket-only postgresql server for setting up user or running scripts
 # all arguments will be passed along as arguments to `postgres` (via pg_ctl)
 docker_temp_server_start() {
+	if [ "$1" = 'postgres' ]; then
+		shift
+	fi
 	# internal start of server in order to allow set-up using psql-client
 	# does not listen on external TCP/IP and waits until start finishes (can be overridden via args)
 	PGUSER="${PGUSER:-$POSTGRES_USER}" \
@@ -214,6 +219,7 @@ _main() {
 
 
 	if [ "$1" = 'postgres' ]; then
+		docker_setup_env
 		# setup data directories and permissions (when run as root)
 		docker_create_db_directories
 		if [ "$(id -u)" = '0' ]; then
@@ -224,20 +230,18 @@ _main() {
 		# only run initialization on an empty data directory
 		# look specifically for PG_VERSION, as it is expected in the DB dir
 		if [ ! -s "$PGDATA/PG_VERSION" ]; then
-			docker_init_database_dir
-
-			docker_setup_env
 			docker_verify_minimum_env
+			docker_init_database_dir
 			pg_setup_hba_conf
 
 			# PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless
 			# e.g. when '--auth=md5' or '--auth-local=md5' is used in POSTGRES_INITDB_ARGS
 			export PGPASSWORD="${PGPASSWORD:-$POSTGRES_PASSWORD}"
-			docker_temp_server_start "${@:2}"
+			docker_temp_server_start "$@"
 
 			docker_setup_db
 
-			docker_process_init_files
+			docker_process_init_files /docker-entrypoint-initdb.d/*
 
 			docker_temp_server_stop
 			unset PGPASSWORD