Update entrypoint.sh

entrypoint.sh

@@ -1,26 +1,45 @@
 #!/usr/bin/env bash
 set -e
 
-# Ensure basic dirs
-mkdir -p /data/exports /var/log/supervisor
+mkdir -p /data/exports
 
-# Prefer /app/supervisord.conf, but fall back to /app/supervisor.conf
-SUP_CONF="/app/supervisord.conf"
-if [ ! -f "$SUP_CONF" ] && [ -f "/app/supervisor.conf" ]; then
-  SUP_CONF="/app/supervisor.conf"
-fi
+# ---------------- Optional: Internal Postgres ----------------
+# USE_INTERNAL_POSTGRES=true のときだけ内部で起動（既定は SQLite）
+if [ "$USE_INTERNAL_POSTGRES" = "true" ]; then
+  echo "[entrypoint] Starting internal Postgres..."
+  mkdir -p /data/postgres
+  chown -R postgres:postgres /data/postgres || true
+
+  PG_BIN=$(pg_config --bindir 2>/dev/null || echo "/usr/lib/postgresql/15/bin")
+
+  # initdb（既に初期化済みならスキップ）
+  su - postgres -c "$PG_BIN/initdb -D /data/postgres" || true
+
+  # 起動
+  su - postgres -c "$PG_BIN/pg_ctl -D /data/postgres -l /data/postgres/logfile start"
+  sleep 2
 
-# Start supervisord with selected config
-if [ -f "$SUP_CONF" ]; then
-  echo "Using supervisord config: $SUP_CONF"
-  /usr/bin/supervisord -c "$SUP_CONF" &
-else
-  echo "No supervisord config found. Exiting."
-  exit 2
+  # ユーザー & DB を作成（存在しない場合のみ）
+  su - postgres -c "psql -tc \"SELECT 1 FROM pg_roles WHERE rolname='${POSTGRES_USER}'\" | grep -q 1 || psql -c \"CREATE USER ${POSTGRES_USER} WITH PASSWORD '${POSTGRES_PASSWORD}';\""
+  su - postgres -c "psql -lqt | cut -d \| -f 1 | grep -qw ${POSTGRES_DB} || createdb -O ${POSTGRES_USER} ${POSTGRES_DB}"
 fi
 
-# Initialize DB & admin (wait for app process readiness)
+# ---------------- Redis ----------------
+echo "[entrypoint] Starting redis-server..."
+/usr/bin/redis-server --save "" --appendonly no &
+
+# ---------------- Celery ----------------
+echo "[entrypoint] Starting celery worker..."
+cd /app
+celery -A app.tasks.celery_app worker --loglevel=INFO &
+
+# ---------------- FastAPI (Uvicorn) ----------------
+echo "[entrypoint] Starting uvicorn..."
+python -m app.main &
+
+# ---------------- One-shot DB bootstrap ----------------
+echo "[entrypoint] Running init_db bootstrap..."
 python /app/scripts/init_db.py || true
 
-# Keep container running by waiting on background jobs
+# ---------------- Wait on background processes ----------------
 wait -n