Update hf-entrypoint.sh

hf-entrypoint.sh

@@ -1,53 +1,49 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-echo "[boot] starting postgres + redis + sub2api"
-
-# ========== 1) 启动 Redis ==========
+run_as_postgres() {
+  if id postgres >/dev/null 2>&1; then
+    if command -v gosu >/dev/null 2>&1; then
+      gosu postgres "$@"
+    elif command -v su-exec >/dev/null 2>&1; then
+      su-exec postgres "$@"
+    else
+      su postgres -s /bin/sh -c "$(printf '%q ' "$@")"
+    fi
+  else
+    "$@"
+  fi
+}
+
+echo "[boot] start redis"
 redis-server --bind 127.0.0.1 --port 6379 --daemonize yes
-echo "[boot] redis started on 127.0.0.1:6379"
-
-# ========== 2) 初始化并启动 PostgreSQL ==========
-PG_BIN="/usr/lib/postgresql/15/bin"
 
+echo "[boot] init/start postgres"
 mkdir -p "${PGDATA}"
-chown -R postgres:postgres "${PGDATA}"
+if id postgres >/dev/null 2>&1; then
+  chown -R postgres:postgres "${PGDATA}" || true
+fi
 
 if [ ! -s "${PGDATA}/PG_VERSION" ]; then
-  echo "[boot] initdb at ${PGDATA}"
-  gosu postgres "${PG_BIN}/initdb" -D "${PGDATA}" > /dev/null
+  run_as_postgres initdb -D "${PGDATA}" >/dev/null
 fi
 
-# 固定监听本地 5432
-cat >> "${PGDATA}/postgresql.conf" <<EOF
-listen_addresses = '127.0.0.1'
-port = 5432
-max_connections = 100
-EOF
-
-# 允许本地密码连接（容器内）
-cat > "${PGDATA}/pg_hba.conf" <<EOF
-local   all             all                                     trust
-host    all             all             127.0.0.1/32            scram-sha-256
-host    all             all             ::1/128                 scram-sha-256
-EOF
-
-gosu postgres "${PG_BIN}/pg_ctl" -D "${PGDATA}" -w start
+run_as_postgres pg_ctl -D "${PGDATA}" -o "-c listen_addresses=127.0.0.1 -c port=5432" -w start
 
 # 创建用户和库（幂等）
-gosu postgres psql -v ON_ERROR_STOP=1 --username postgres <<SQL
+run_as_postgres psql -v ON_ERROR_STOP=1 --username postgres --dbname postgres <<SQL
 DO \$\$
 BEGIN
   IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = '${POSTGRES_USER}') THEN
     CREATE ROLE ${POSTGRES_USER} LOGIN PASSWORD '${POSTGRES_PASSWORD}';
   ELSE
-    ALTER ROLE ${POSTGRES_USER} WITH PASSWORD '${POSTGRES_PASSWORD}';
+    ALTER ROLE ${POSTGRES_USER} WITH LOGIN PASSWORD '${POSTGRES_PASSWORD}';
   END IF;
 END
 \$\$;
 SQL
 
-gosu postgres psql -v ON_ERROR_STOP=1 --username postgres <<SQL
+run_as_postgres psql -v ON_ERROR_STOP=1 --username postgres --dbname postgres <<SQL
 DO \$\$
 BEGIN
   IF NOT EXISTS (SELECT FROM pg_database WHERE datname = '${POSTGRES_DB}') THEN
@@ -57,34 +53,25 @@ END
 \$\$;
 SQL
 
-echo "[boot] postgres started on 127.0.0.1:5432"
-
-# ========== 3) 导出给 sub2api 的连接变量 ==========
 export DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@127.0.0.1:5432/${POSTGRES_DB}"
 export POSTGRES_URL="${DATABASE_URL}"
 export DB_URL="${DATABASE_URL}"
 export REDIS_URL="${REDIS_URL}"
-
-# 常见应用端口变量
 export PORT="${PORT:-8080}"
-export APP_PORT="${PORT}"
 export HOST="${HOST:-0.0.0.0}"
 
 echo "[boot] DATABASE_URL=${DATABASE_URL}"
 echo "[boot] REDIS_URL=${REDIS_URL}"
-echo "[boot] APP PORT=${PORT}"
+echo "[boot] APP_PORT=${PORT}"
 
-# ========== 4) 启动 sub2api ==========
-# 情况A：基础镜像有默认 CMD（最理想）
+# 优先执行镜像原始 CMD；如无则用 SUB2API_CMD
 if [ "$#" -gt 0 ]; then
   exec "$@"
 fi
 
-# 情况B：基础镜像没有 CMD，手动指定 SUB2API_CMD
 if [ -n "${SUB2API_CMD:-}" ]; then
   exec bash -lc "${SUB2API_CMD}"
 fi
 
-echo "[error] No base CMD and SUB2API_CMD not set."
-echo "[hint] set Space variable SUB2API_CMD, e.g. 'python main.py' or 'node server.js'"
+echo "[error] No CMD found. Please set Space variable SUB2API_CMD"
 exit 1