diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 18ef906..10cefa7 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -88,17 +88,6 @@ docker_init_database_dir() { set -- --waldir "$POSTGRES_INITDB_WALDIR" "$@" fi - - - echo "[DEBUG] POSTGRES_USER=$POSTGRES_USER" >&2 - echo "[DEBUG] POSTGRES_PASSWORD=$POSTGRES_PASSWORD" >&2 - echo "[DEBUG] POSTGRES_INITDB_ARGS=$POSTGRES_INITDB_ARGS" >&2 - echo "[DEBUG] \$@ = $@" >&2 - - # 实际拼接结果 - eval_str='initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"' - echo "[DEBUG] eval command = $eval_str" >&2 - # --pwfile refuses to handle a properly-empty file (hence the "\n"): https://github.com/docker-library/postgres/issues/1025 eval 'initdb --username="$POSTGRES_USER" --pwfile=<(printf "%s\n" "$POSTGRES_PASSWORD") '"$POSTGRES_INITDB_ARGS"' "$@"' @@ -341,7 +330,7 @@ _main() { docker_init_database_dir sed -i "s/^#*\s*listen_addresses\s*=.*/listen_addresses = '0.0.0.0'/" "$PGDATA"/postgresql.conf - + pg_setup_hba_conf "$@" # PGPASSWORD is required for psql when authentication is required for 'local' connections via pg_hba.conf and is otherwise harmless