cleanup

entrypoint.sh

@@ -28,41 +28,17 @@ docker_setup_env() {
 	file_env 'POSTGRES_PGPOOL_PASSWORD'
 }
 
-docker_init_database() {
-	local uid; uid="$(id -u)"
-	if ! getent passwd "$uid" &> /dev/null; then
-		local wrapper
-		for wrapper in {/usr,}/lib{/*,}/libnss_wrapper.so; do
-			if [ -s "$wrapper" ]; then
-				NSS_WRAPPER_PASSWD="$(mktemp)"
-				NSS_WRAPPER_GROUP="$(mktemp)"
-				export LD_PRELOAD="$wrapper" NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
-				local gid; gid="$(id -g)"
-				printf 'postgres:x:%s:%s:PostgreSQL:%s:/bin/false\n' "$uid" "$gid" "$PGDATA" > "$NSS_WRAPPER_PASSWD"
-				printf 'postgres:x:%s:\n' "$gid" > "$NSS_WRAPPER_GROUP"
-				break
-			fi
-		done
-	fi
-	eval 'initdb --username=postgres --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"'
-
-	if [[ "${LD_PRELOAD:-}" == */libnss_wrapper.so ]]; then
-		rm -f "$NSS_WRAPPER_PASSWD" "$NSS_WRAPPER_GROUP"
-		unset LD_PRELOAD NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
-	fi
-}
-
 docker_temp_server_start() {
   NOTIFY_SOCKET= \
-  PGUSER="${PGUSER:-postgres}" \
-  pg_ctl -D "$PGDATA" \
+  PGUSER="postgres" \
+  pg_ctl -D "${PGDATA}" \
   	-o "-c listen_addresses='' -p 5432" \
    	-w start
 }
 
 docker_temp_server_stop() {
-	PGUSER="${PGUSER:-postgres}" \
-	pg_ctl -D "$PGDATA" -m fast -w stop
+	PGUSER="postgres" \
+	pg_ctl -D "${PGDATA}" -m fast -w stop
 }
 
 pg_setup_conf() {
@@ -100,7 +76,6 @@ pg_setup_hba_conf() {
 	} >> "$PGDATA/pg_hba.conf"
 }
 
-
 if [ "$(id -u)" = '0' ]; then
 	exec gosu postgres "$BASH_SOURCE"
 fi
@@ -109,10 +84,9 @@ docker_setup_env
 
 if [[ ! -s "$PGDATA/PG_VERSION" ]]; then
   if [[ -z $POSTGRES_UPSTREAM ]] || [[ -z $POSTGRES_REPLICATOR_USERNAME ]]; then
-    docker_init_database
+    initdb --username=postgres --pwfile=<(printf "%s\n" "${POSTGRES_PASSWORD}")
     pg_setup_conf
     pg_setup_hba_conf
-
     if [[ -n $POSTGRES_REPLICATOR_USERNAME ]] || [[ -n $POSTGRES_PGPOOL_USERNAME ]]; then
       export PGPASSWORD="$POSTGRES_PASSWORD"
       docker_temp_server_start
@@ -126,7 +100,6 @@ if [[ ! -s "$PGDATA/PG_VERSION" ]]; then
       docker_temp_server_stop
   		unset PGPASSWORD
     fi
-
   else
     until pg_basebackup -h "${POSTGRES_UPSTREAM}" -U "${POSTGRES_REPLICATOR_USERNAME}" -D "${PGDATA}" -Fp -Xs -R &> /dev/null
     do
@@ -134,9 +107,7 @@ if [[ ! -s "$PGDATA/PG_VERSION" ]]; then
       sleep 300
     done
   fi
-
 fi
 
 sudo service ssh start
-
 postgres