fix(dev): 兼容 Compose 数据库容器启动

保留显式数据库连接配置,自动识别 Compose PostgreSQL 容器及宿主机端口,并在容器不存在时跳过不适用的 Docker 建库。\n\n验证:bash -n;ShellCheck;scripts/create-database.sh;pnpm dev 真实启动 API 与 Web
This commit is contained in:
2026-07-22 17:12:48 +08:00
parent 3de26d5157
commit c305603589
2 changed files with 74 additions and 16 deletions
+63 -15
View File
@@ -24,6 +24,47 @@ load_local_env() {
load_local_env
find_postgres_container() {
local candidate compose_container
if [[ -n "${AI_GATEWAY_PG_CONTAINER:-}" ]]; then
if docker inspect "$AI_GATEWAY_PG_CONTAINER" >/dev/null 2>&1; then
printf '%s\n' "$AI_GATEWAY_PG_CONTAINER"
return 0
fi
return 1
fi
for candidate in easyai-pgvector postgres; do
if docker inspect "$candidate" >/dev/null 2>&1; then
printf '%s\n' "$candidate"
return 0
fi
done
compose_container="$(
docker compose -f "${PROJECT_ROOT}/docker-compose.yml" ps -q postgres 2>/dev/null \
| head -n 1
)"
if [[ -n "$compose_container" ]] && docker inspect "$compose_container" >/dev/null 2>&1; then
printf '%s\n' "$compose_container"
return 0
fi
return 1
}
postgres_host_port() {
local mapping port
mapping="$(docker port "$1" 5432/tcp 2>/dev/null | head -n 1)"
port="${mapping##*:}"
if [[ "$port" =~ ^[0-9]+$ ]]; then
printf '%s\n' "$port"
else
printf '5432\n'
fi
}
stop_stale_api_processes() {
local api_port="${HTTP_ADDR:-:8088}"
api_port="${api_port##*:}"
@@ -66,37 +107,44 @@ stop_stale_api_processes() {
sleep 0.5
}
if [[ -z "${AI_GATEWAY_PG_CONTAINER:-}" ]]; then
if docker inspect easyai-pgvector >/dev/null 2>&1; then
export AI_GATEWAY_PG_CONTAINER="easyai-pgvector"
elif docker inspect postgres >/dev/null 2>&1; then
export AI_GATEWAY_PG_CONTAINER="postgres"
else
export AI_GATEWAY_PG_CONTAINER="easyai-pgvector"
fi
database_url_was_configured=0
pg_container_was_configured=0
[[ -n "${AI_GATEWAY_DATABASE_URL:-}" ]] && database_url_was_configured=1
[[ -n "${AI_GATEWAY_PG_CONTAINER:-}" ]] && pg_container_was_configured=1
postgres_container="$(find_postgres_container || true)"
if [[ -n "$postgres_container" ]]; then
export AI_GATEWAY_PG_CONTAINER="$postgres_container"
elif [[ "$pg_container_was_configured" == "1" ]]; then
echo "[ai-gateway] configured PostgreSQL container is unavailable; using the database URL without Docker database creation" >&2
fi
export AI_GATEWAY_PG_USER="${AI_GATEWAY_PG_USER:-easyai}"
if [[ -z "${AI_GATEWAY_PG_PASSWORD:-}" ]] && docker inspect "$AI_GATEWAY_PG_CONTAINER" >/dev/null 2>&1; then
if [[ -z "${AI_GATEWAY_PG_PASSWORD:-}" && -n "$postgres_container" ]]; then
AI_GATEWAY_PG_PASSWORD="$(
docker inspect "$AI_GATEWAY_PG_CONTAINER" --format '{{range .Config.Env}}{{println .}}{{end}}' \
docker inspect "$postgres_container" --format '{{range .Config.Env}}{{println .}}{{end}}' \
| awk -F= '$1 == "POSTGRES_PASSWORD" {print $2; exit}'
)"
export AI_GATEWAY_PG_PASSWORD
fi
export AI_GATEWAY_PG_PASSWORD="${AI_GATEWAY_PG_PASSWORD:-easyai2025}"
export AI_GATEWAY_DATABASE_NAME="${AI_GATEWAY_DATABASE_NAME:-easyai_ai_gateway}"
if docker inspect "$AI_GATEWAY_PG_CONTAINER" >/dev/null 2>&1; then
export AI_GATEWAY_DATABASE_URL="postgresql://${AI_GATEWAY_PG_USER}:${AI_GATEWAY_PG_PASSWORD}@localhost:5432/${AI_GATEWAY_DATABASE_NAME}?sslmode=disable"
else
export AI_GATEWAY_DATABASE_URL="${AI_GATEWAY_DATABASE_URL:-postgresql://${AI_GATEWAY_PG_USER}:${AI_GATEWAY_PG_PASSWORD}@localhost:5432/${AI_GATEWAY_DATABASE_NAME}?sslmode=disable}"
if [[ "$database_url_was_configured" == "0" ]]; then
postgres_port=5432
if [[ -n "$postgres_container" ]]; then
postgres_port="$(postgres_host_port "$postgres_container")"
fi
export AI_GATEWAY_DATABASE_URL="postgresql://${AI_GATEWAY_PG_USER}:${AI_GATEWAY_PG_PASSWORD}@localhost:${postgres_port}/${AI_GATEWAY_DATABASE_NAME}?sslmode=disable"
fi
echo "[ai-gateway] using configured local database connection (credentials redacted)"
if [[ "${AI_GATEWAY_SKIP_DB_CREATE:-}" == "1" ]]; then
echo "[ai-gateway] skipping Docker database creation"
else
elif [[ -n "$postgres_container" && ( "$database_url_was_configured" == "0" || "$pg_container_was_configured" == "1" ) ]]; then
scripts/create-database.sh
else
echo "[ai-gateway] no matching Docker database container selected; skipping database creation"
fi
pnpm nx run api:migrate
stop_stale_api_processes