Merge branch 'main' into feat/refactor-and-ollama-cloud-models

Author: jonigl

README.md

@@ -169,7 +169,15 @@ Create an MCP configuration file at `mcp-config.json` with your servers:
 }
 ```
 
-### CORS Configurationn
+> [!WARNING]
+> **Docker Command Limitations**: When running in Docker, MCP servers should use commands available in the container:
+> - ✅ `npx` for Node.js-based MCP servers
+> - ✅ `uvx` for Python-based MCP servers
+> - ✅ Direct executables in the container
+> - ❌ `docker` commands (unless Docker-in-Docker is configured)
+> - ❌ Local file paths from your host machine
+
+### CORS Configuration
 
 Configure Cross-Origin Resource Sharing (CORS) to allow requests from your frontend applications:
 
@@ -185,6 +193,9 @@ CORS_ORIGINS="http://localhost:3000,http://localhost:8080,https://app.example.co
 ```
 
 **Environment Variables:**
+- `OLLAMA_URL`: URL of the Ollama server (default: `http://localhost:11434`)
+  - Can be overridden with `--ollama-url` CLI parameter
+  - Useful for Docker deployments and configuration management
 - `CORS_ORIGINS`: Comma-separated list of allowed origins (default: `*`)
   - `*` allows all origins (shows warning in logs)
   - Specific origins like `http://localhost:3000,https://myapp.com` for production

docker-compose.yml

@@ -11,4 +11,3 @@ services:
     volumes:
       - ./mcp-config.json:/root/mcp-config.json
     restart: unless-stopped
-    command: uv run ollama-mcp-bridge --ollama-url=http://host.docker.internal:11434

src/ollama_mcp_bridge/main.py

@@ -1,5 +1,6 @@
 """Simple CLI entry point for MCP Proxy"""
 import asyncio
+import os
 import typer
 import uvicorn
 from loguru import logger
@@ -12,7 +13,7 @@ def cli_app(
     config: str = typer.Option("mcp-config.json", "--config", help="Path to MCP config JSON file"),
     host: str = typer.Option("0.0.0.0", "--host", help="Host to bind to"),
     port: int = typer.Option(8000, "--port", help="Port to bind to"),
-    ollama_url: str = typer.Option("http://localhost:11434", "--ollama-url", help="Ollama server URL"),
+    ollama_url: str = typer.Option(os.getenv("OLLAMA_URL", "http://localhost:11434"), "--ollama-url", help="Ollama server URL"),
     reload: bool = typer.Option(False, "--reload", help="Enable auto-reload"),
     version: bool = typer.Option(False, "--version", help="Show version information, check for updates and exit"),
 ):