Update hf-entrypoint.sh

hf-entrypoint.sh

@@ -28,11 +28,12 @@ if [ ! -s "${PGDATA}/PG_VERSION" ]; then
   run_as_postgres initdb -D "${PGDATA}" >/dev/null
 fi
 
+# Place Unix socket under /tmp to avoid missing /run/postgresql in HF runtime.
 run_as_postgres pg_ctl -D "${PGDATA}" \
   -o "-c listen_addresses=127.0.0.1 -c port=5432 -c unix_socket_directories=/tmp" \
   -w start
 
-# 1) 角色可用 DO（允许）
+# Upsert DB role.
 run_as_postgres psql -h 127.0.0.1 -p 5432 -v ON_ERROR_STOP=1 --username postgres --dbname postgres <<SQL
 DO \$\$
 BEGIN
@@ -45,7 +46,7 @@ END
 \$\$;
 SQL
 
-# 2) 数据库不能放 DO，改成 shell 判断
+# CREATE DATABASE cannot run inside DO block. Check first, then createdb.
 DB_EXISTS=$(run_as_postgres psql -h 127.0.0.1 -p 5432 -U postgres -d postgres -tAc \
   "SELECT 1 FROM pg_database WHERE datname='${POSTGRES_DB}'")
 
@@ -59,33 +60,25 @@ export DB_URL="${DATABASE_URL}"
 export REDIS_URL="${REDIS_URL:-redis://127.0.0.1:6379/0}"
 export PORT="${PORT:-8080}"
 export HOST="${HOST:-0.0.0.0}"
+export AUTO_SETUP="${AUTO_SETUP:-true}"
+export SERVER_HOST="${HOST}"
+export SERVER_PORT="${PORT}"
+export DATABASE_HOST="${DATABASE_HOST:-127.0.0.1}"
+export DATABASE_PORT="${DATABASE_PORT:-5432}"
+export DATABASE_USER="${POSTGRES_USER}"
+export DATABASE_PASSWORD="${POSTGRES_PASSWORD}"
+export DATABASE_DBNAME="${POSTGRES_DB}"
+export DATABASE_SSLMODE="${DATABASE_SSLMODE:-disable}"
+export REDIS_HOST="${REDIS_HOST:-127.0.0.1}"
+export REDIS_PORT="${REDIS_PORT:-6379}"
+export REDIS_DB="${REDIS_DB:-0}"
+export REDIS_PASSWORD="${REDIS_PASSWORD:-}"
+export REDIS_ENABLE_TLS="${REDIS_ENABLE_TLS:-false}"
 
-echo "[boot] DATABASE_URL=${DATABASE_URL}"
+echo "[boot] DATABASE_URL=postgresql://${POSTGRES_USER}:******@127.0.0.1:5432/${POSTGRES_DB}"
 echo "[boot] REDIS_URL=${REDIS_URL}"
 echo "[boot] APP_PORT=${PORT}"
 
-if [ "$#" -gt 0 ]; then
-  exec "$@"
-fi
-
-# 优先手动指定
-if [ -n "${SUB2API_CMD:-}" ]; then
-  exec bash -lc "${SUB2API_CMD}"
-fi
-
-# 自动回退：按常见入口顺序尝试
-if [ -x /docker-entrypoint.sh ]; then
-  exec /docker-entrypoint.sh
-elif [ -x /entrypoint.sh ]; then
-  exec /entrypoint.sh
-elif command -v sub2api >/dev/null 2>&1; then
-  exec sub2api
-elif [ -x /app/sub2api ]; then
-  exec /app/sub2api
-fi
-
-echo "[error] cannot find original sub2api entrypoint"
-exit 1
-
-echo "[error] No CMD found. Please set Space variable SUB2API_CMD"
-exit 1
+# Start sub2api with the original entrypoint discovered from the base image.
+mkdir -p /app/data
+exec /app/sub2api