Fix Docker container startup conflicts and improve error diagnostics

.dockerignore

@@ -0,0 +1,30 @@
+# Python artifacts
+__pycache__/
+*.py[cod]
+*$py.class
+
+# Virtual environments
+.venv/
+venv/
+env/
+
+# OS / IDE
+.DS_Store
+Thumbs.db
+.idea/
+.vscode/
+
+# Git
+.git/
+.gitignore
+
+# Local data and caches
+data/
+logs/
+
+# Node / misc large dirs (if ever created)
+node_modules/
+
+# Docker build outputs
+*.log
+

Dockerfile

@@ -0,0 +1,34 @@
+FROM python:3.10-slim
+
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
+
+WORKDIR /app
+
+# Install system dependencies
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+        build-essential \
+        curl \
+        git && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install Python dependencies
+COPY requirements.txt /tmp/requirements.txt
+RUN pip install --upgrade pip && \
+    pip install --no-cache-dir -r /tmp/requirements.txt
+
+# Copy project files
+COPY . .
+
+# Ensure entrypoint script is executable
+RUN chmod +x docker-entrypoint.sh
+
+EXPOSE 7860 8000 8900
+
+ENV API_PORT=8000 \
+    MCP_PORT=8900 \
+    GRADIO_PORT=7860
+
+ENTRYPOINT ["./docker-entrypoint.sh"]
+

app.py

@@ -2732,13 +2732,17 @@ if __name__ == "__main__":
     import time
     import requests
     
-    # For Hugging Face Spaces, bind to 0.0.0.0; for local dev, use 127.0.0.1
-    # HF Spaces sets SPACE_ID environment variable
+    # Detect environment
+    # - HF Spaces sets SPACE_ID
+    # - Docker entrypoint script manages services, so don't auto-start here
     is_hf_space = os.getenv("SPACE_ID") is not None
-    server_name = "0.0.0.0" if is_hf_space else "127.0.0.1"
+    is_docker = os.path.exists("/.dockerenv") or os.getenv("DOCKER_CONTAINER") == "1"
     
-    # Start backend services if running in HF Spaces
-    if is_hf_space:
+    # For Hugging Face Spaces or Docker, bind to 0.0.0.0; for local dev, use 127.0.0.1
+    server_name = "0.0.0.0" if (is_hf_space or is_docker) else "127.0.0.1"
+    
+    # Start backend services if running in HF Spaces (but NOT in Docker - entrypoint handles that)
+    if is_hf_space and not is_docker:
         def start_mcp_server():
             """Start MCP server in a background process."""
             try:

docker-entrypoint.sh

@@ -0,0 +1,92 @@
+#!/bin/bash
+set -euo pipefail
+
+log() {
+    echo "[IntegraChat][$(date -Iseconds)] $*"
+}
+
+API_PORT="${API_PORT:-8000}"
+MCP_PORT="${MCP_PORT:-8900}"
+GRADIO_PORT="${GRADIO_PORT:-7860}"
+
+export API_PORT MCP_PORT GRADIO_PORT
+
+LOG_DIR="/app/logs"
+mkdir -p "${LOG_DIR}"
+
+log "Container starting. Python: $(python --version 2>&1)"
+log "API_PORT=${API_PORT}, MCP_PORT=${MCP_PORT}, GRADIO_PORT=${GRADIO_PORT}"
+
+cleanup() {
+    log "Received termination signal. Stopping services..."
+    # Kill child processes
+    kill "${MCP_PID}" "${API_PID}" "${GRADIO_PID}" "${TAIL_PID}" 2>/dev/null || true
+    wait || true
+    log "All services stopped. Exiting."
+}
+trap cleanup SIGTERM SIGINT
+
+# Start MCP server
+log "Starting MCP server..."
+python -m backend.mcp_server.server > "${LOG_DIR}/mcp.log" 2>&1 &
+MCP_PID=$!
+
+# Give MCP a moment
+sleep 2
+
+# Start FastAPI backend
+log "Starting FastAPI backend..."
+uvicorn backend.api.main:app --host 0.0.0.0 --port "${API_PORT}" > "${LOG_DIR}/fastapi.log" 2>&1 &
+API_PID=$!
+
+# Check if FastAPI process started
+sleep 2
+if ! kill -0 "${API_PID}" 2>/dev/null; then
+    log "ERROR: FastAPI process died immediately. Last 20 lines of log:"
+    tail -n 20 "${LOG_DIR}/fastapi.log" || true
+    exit 1
+fi
+
+# Wait for FastAPI to become healthy
+log "Waiting for FastAPI health endpoint..."
+for attempt in {1..60}; do
+    if curl -fsS "http://127.0.0.1:${API_PORT}/health" >/dev/null 2>&1; then
+        log "FastAPI backend is healthy."
+        break
+    fi
+    # Check if process is still running
+    if ! kill -0 "${API_PID}" 2>/dev/null; then
+        log "ERROR: FastAPI process died. Last 20 lines of log:"
+        tail -n 20 "${LOG_DIR}/fastapi.log" || true
+        exit 1
+    fi
+    sleep 1
+    if [ $((attempt % 10)) -eq 0 ]; then
+        log "FastAPI not ready yet (attempt ${attempt}/60). Last 5 lines of log:"
+        tail -n 5 "${LOG_DIR}/fastapi.log" || true
+    else
+        log "FastAPI not ready yet (attempt ${attempt}/60)..."
+    fi
+done
+
+# Final check
+if ! curl -fsS "http://127.0.0.1:${API_PORT}/health" >/dev/null 2>&1; then
+    log "WARNING: FastAPI health check failed after 60 attempts. Last 30 lines of log:"
+    tail -n 30 "${LOG_DIR}/fastapi.log" || true
+    log "Continuing anyway..."
+fi
+
+# Start Gradio UI (foreground)
+log "Starting Gradio UI on port ${GRADIO_PORT}..."
+# Set DOCKER_CONTAINER flag so app.py knows not to auto-start services
+export DOCKER_CONTAINER=1
+python app.py > "${LOG_DIR}/gradio.log" 2>&1 &
+GRADIO_PID=$!
+
+log "All services launched. Streaming logs (Ctrl+C to stop)..."
+tail -n 50 -F "${LOG_DIR}/"*.log &
+TAIL_PID=$!
+
+wait "${GRADIO_PID}"
+cleanup
+