Merge pull request #385 from geowa4/update-containerfile-for-openshift-deployment

perf(mcp): optimize container for OpenShift deployment

Author: openshift-merge-bot[bot]

Makefile

@@ -38,4 +38,4 @@ build-container:
 	@mkdir -p mcp/managed-notifications
 	@cp -r cluster hcp ocm osd rosa scripts mcp/managed-notifications/
 	@echo "Building container with podman..."
-	cd mcp && podman build --no-cache -t managed-notifications-search .
+	cd mcp && podman build --no-cache $(shell [ "$$(uname)" = "Darwin" ] && echo "--platform linux/amd64") -t managed-notifications-search:latest -f Containerfile .

mcp/Containerfile

@@ -1,12 +1,14 @@
-# Multi-stage build for Managed Notifications Search MCP Server
-# Stage 1: Build embeddings (only rebuilds when notifications or script changes)
-FROM python:3.13-slim as embeddings-builder
+# Alternative Containerfile that downloads model and builds embeddings at runtime
+# This reduces image size significantly but adds 2-5 minutes to startup time
+
+FROM python:3.13-slim
 
 # Install uv
 COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /usr/local/bin/
 
 # Set working directory
 WORKDIR /app
+ENV UV_NO_CACHE=1
 
 # Copy all source files
 COPY pyproject.toml ./
@@ -15,50 +17,30 @@ COPY uv.lock ./
 # Install dependencies and project
 RUN uv sync --frozen --no-dev
 
-# Pre-download the sentence transformer model
-RUN uv run python -c "from sentence_transformers import SentenceTransformer; SentenceTransformer('all-MiniLM-L6-v2')"
-
-# Build embeddings database
+# Copy notification templates and scripts (embeddings built at runtime)
 COPY scripts/ ./scripts/
 COPY managed-notifications/ ./managed-notifications/
-RUN uv run scripts/build_embeddings.py
-
-# Stage 2: Runtime image with MCP server
-FROM python:3.13-slim as runtime
-
-# Install uv
-COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /usr/local/bin/
-
-# Set working directory
-WORKDIR /app
-
-# Copy all source files
-COPY pyproject.toml ./
-COPY uv.lock ./
-
-# Install dependencies and project
-RUN uv sync --frozen --no-dev
-
-# Pre-download the sentence transformer model
-RUN uv run python -c "from sentence_transformers import SentenceTransformer; SentenceTransformer('all-MiniLM-L6-v2')"
-
-# Copy pre-built embeddings database from builder stage
-COPY --from=embeddings-builder /app/chroma_db/ ./chroma_db/
 
 # Set environment variables for MCP server
 ENV HOST=0.0.0.0
 ENV PORT=8000
+ENV HF_HOME=/tmp/huggingface
+ENV TRANSFORMERS_CACHE=/tmp/huggingface
+ENV CHROMA_DB_PATH=/tmp/chroma_db
 
 # Copy mcp server code
 COPY main.py ./
 
-# Create non-root user for security
-RUN useradd --create-home --shell /bin/bash mcp
-RUN chown -R mcp:mcp /app
-USER mcp
+# Create startup script that builds embeddings and starts server
+RUN echo '#!/bin/sh\n\
+echo "Building embeddings database (this may take 2-5 minutes)..."\n\
+uv run --no-sync scripts/build_embeddings.py\n\
+echo "Embeddings built, starting MCP server..."\n\
+exec uv run --no-sync main.py' > /app/start.sh && \
+    chmod 755 /app/start.sh
 
 # Expose port for MCP server
 EXPOSE 8000
 
 # Default command
-CMD ["uv", "run", "main.py"]
+CMD ["/app/start.sh"]

mcp/main.py

@@ -1,6 +1,7 @@
 """MCP server for searching managed service notification logs."""
 
 import json
+import os
 from pathlib import Path
 from typing import Any, Dict, List
 
@@ -113,7 +114,7 @@ def search_notifications(
 
 # Initialize the search server
 project_root = Path(__file__).parent
-db_path = project_root / "chroma_db"
+db_path = Path(os.getenv("CHROMA_DB_PATH", str(project_root / "chroma_db")))
 search_server = NotificationSearchServer(db_path)
 
 

mcp/scripts/build_embeddings.py

@@ -182,9 +182,9 @@ def main() -> None:
     """Main function to build embeddings database."""
     script_dir = Path(__file__).parent
     project_root = script_dir.parent
-    
+
     notifications_dir = project_root / "managed-notifications"
-    db_path = project_root / "chroma_db"
+    db_path = Path(os.getenv("CHROMA_DB_PATH", str(project_root / "chroma_db")))
 
     if not notifications_dir.exists():
         print(f"Error: Managed notifications directory not found at {notifications_dir}")