Start alembic revision history (#240)

* Alembic bootstrap with alembic_version table
Signed-off-by: Madhav Kandukuri <[email protected]>

* Remove migration dependence
Signed-off-by: Madhav Kandukuri <[email protected]>

Author: madhav165

alembic/env.py

@@ -19,7 +19,10 @@
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
 if config.config_file_name is not None:
-    fileConfig(config.config_file_name)
+    fileConfig(
+        config.config_file_name,
+        disable_existing_loggers=False,
+    )
 
 # First-Party
 # add your model's MetaData object here

docker-compose.yml

@@ -58,8 +58,8 @@ services:
         condition: service_healthy   # ▶ wait for DB
       redis:
         condition: service_started
-      migration:
-        condition: service_completed_successfully
+      # migration:
+      #   condition: service_completed_successfully
 
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:4444/health"]
@@ -121,19 +121,19 @@ services:
   #   volumes: [mongodata:/data/db]
   #   networks: [mcpnet]
 
-  migration:
-    #image: ghcr.io/ibm/mcp-context-forge:0.2.0 # Use the release MCP Context Forge image
-    image: mcpgateway/mcpgateway:latest # Use the local latest image. Run `make docker-prod` to build it.
-    build:
-      context: .
-      dockerfile: Containerfile
-    environment:
-      - DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD:-mysecretpassword}@postgres:5432/mcp
-    command: alembic upgrade head
-    depends_on:
-      postgres:
-        condition: service_healthy
-    networks: [mcpnet]
+  # migration:
+  #   #image: ghcr.io/ibm/mcp-context-forge:0.2.0 # Use the release MCP Context Forge image
+  #   image: mcpgateway/mcpgateway:latest # Use the local latest image. Run `make docker-prod` to build it.
+  #   build:
+  #     context: .
+  #     dockerfile: Containerfile
+  #   environment:
+  #     - DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD:-mysecretpassword}@postgres:5432/mcp
+  #   command: alembic upgrade head
+  #   depends_on:
+  #     postgres:
+  #       condition: service_healthy
+  #   networks: [mcpnet]
 
 ###############################################################################
 #  CACHE

mcpgateway/bootstrap_db.py

@@ -0,0 +1,45 @@
+# mcpgateway/bootstrap_db.py
+# Standard
+import asyncio
+import logging
+from pathlib import Path
+
+# First-Party
+from alembic import command
+from alembic.config import Config
+from mcpgateway.config import settings
+from mcpgateway.db import Base
+
+# Third-Party
+from sqlalchemy import create_engine, inspect
+
+logger = logging.getLogger(__name__)
+
+
+async def main():
+    """
+    Bootstrap or upgrade the database schema, then log readiness.
+
+    Runs `create_all()` + `alembic stamp head` on an empty DB, otherwise just
+    executes `alembic upgrade head`, leaving application data intact.
+    """
+    engine = create_engine(settings.database_url)
+    project_root = Path(__file__).resolve().parents[1]
+    ini_path = project_root / "alembic.ini"
+    cfg = Config(ini_path)  # path in container
+    cfg.attributes["configure_logger"] = False
+
+    command.ensure_version(cfg)
+
+    insp = inspect(engine)
+    if "gateways" not in insp.get_table_names():
+        logger.info("Empty DB detected – creating baseline schema")
+        Base.metadata.create_all(engine)
+        command.stamp(cfg, "head")  # record baseline
+    else:
+        command.upgrade(cfg, "head")  # apply any new revisions
+    logger.info("Database ready")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

mcpgateway/main.py

@@ -35,9 +35,10 @@
 # First-Party
 from mcpgateway import __version__
 from mcpgateway.admin import admin_router
+from mcpgateway.bootstrap_db import main as bootstrap_db
 from mcpgateway.cache import ResourceCache, SessionRegistry
 from mcpgateway.config import jsonpath_modifier, settings
-from mcpgateway.db import Base, engine, SessionLocal
+from mcpgateway.db import SessionLocal
 from mcpgateway.handlers.sampling import SamplingHandler
 from mcpgateway.schemas import (
     GatewayCreate,
@@ -144,7 +145,7 @@
 wait_for_db_ready(max_tries=int(settings.db_max_retries), interval=int(settings.db_retry_interval_ms) / 1000, sync=True)  # Converting ms to s
 
 # Create database tables
-Base.metadata.create_all(bind=engine)
+asyncio.run(bootstrap_db())
 
 # Initialize services
 tool_service = ToolService()

run-gunicorn.sh

@@ -74,15 +74,6 @@ if [[ "${SSL}" == "true" ]]; then
     echo "✓  TLS enabled – using ${CERT_FILE} / ${KEY_FILE}"
 fi
 
-# ──────────────────────────────
-# Database migrations / checks
-# ──────────────────────────────
-"${PYTHON}" -m mcpgateway.db
-if [[ $? -ne 0 ]]; then
-    echo "✘  Database migration/check failed. Please resolve issues before starting the server."
-    exit 1
-fi
-
 exec gunicorn -c gunicorn.config.py \
     --worker-class uvicorn.workers.UvicornWorker \
     --workers "${GUNICORN_WORKERS}" \