feat: add option for custom docker host socket

Why:

The socket is different when we use rootless mode with docker.

README.md

@@ -3,7 +3,7 @@
 MC (Monadical Container) is a command-line tool for managing ephemeral
 containers that run AI tools and development environments. It works with both
 local Docker and a dedicated remote web service that manages containers in a
-Docker-in-Docker (DinD) environment. MC also supports connecting to MCP (Model Context Protocol) servers to extend AI tools with additional capabilities.
+Docker-in-Docker (DinD) environment. MC also supports connecting to MCP (Model Control Protocol) servers to extend AI tools with additional capabilities.
 
 ## Quick Reference
 
@@ -265,7 +265,7 @@ Service credentials like API keys configured in `~/.config/mc/config.yaml` are a
 
 ## MCP Server Management
 
-MCP (Model Context Protocol) servers provide tool-calling capabilities to AI models, enhancing their ability to interact with external services, databases, and systems. MC supports multiple types of MCP servers:
+MCP (Model Control Protocol) servers provide tool-calling capabilities to AI models, enhancing their ability to interact with external services, databases, and systems. MC supports multiple types of MCP servers:
 
 1. **Remote HTTP SSE servers** - External MCP servers accessed over HTTP
 2. **Docker-based MCP servers** - Local MCP servers running in Docker containers

mcontainer/cli.py

@@ -1282,14 +1282,17 @@ def mcp_logs(
 
 @mcp_app.command("remove")
 def remove_mcp(name: str = typer.Argument(..., help="MCP server name")) -> None:
-    """Remove an MCP server configuration"""
+    """Remove an MCP server configuration.
+
+    It does not stop the server nor remove it from docker.
+    """
     try:
         # Check if any active sessions might be using this MCP
         active_sessions = container_manager.list_sessions()
         affected_sessions = []
 
         for session in active_sessions:
-            if session.mcps and name in session.mcps:
+            if getattr(session, 'mcps', []) and name in session.mcps:
                 affected_sessions.append(session)
 
         # Just warn users about affected sessions
@@ -1344,6 +1347,9 @@ def add_mcp(
     env: List[str] = typer.Option(
         [], "--env", "-e", help="Environment variables (format: KEY=VALUE)"
     ),
+    docker_host: Optional[str] = typer.Option(
+        None, "--docker-host", help="Docker host socket file that should be mounted on the MCP container",
+    ),
     no_default: bool = typer.Option(
         False, "--no-default", help="Don't add MCP server to defaults"
     ),
@@ -1377,6 +1383,7 @@ def add_mcp(
                 proxy_options,
                 environment,
                 host_port,
+                docker_host,
                 add_as_default=not no_default,
             )
 

mcontainer/container.py

@@ -28,6 +28,7 @@ class ContainerManager:
     ):
         self.config_manager = config_manager or ConfigManager()
         self.session_manager = session_manager or SessionManager()
+
         self.user_config_manager = user_config_manager or UserConfigManager()
         self.mcp_manager = MCPManager(config_manager=self.user_config_manager)
 

mcontainer/mcp.py

@@ -179,6 +179,7 @@ class MCPManager:
         proxy_options: Dict[str, Any] = None,
         env: Dict[str, str] = None,
         host_port: Optional[int] = None,
+        docker_host: Optional[str] = None,
         add_as_default: bool = True,
     ) -> Dict[str, Any]:
         """Add a proxy-based MCP server.
@@ -191,6 +192,7 @@ class MCPManager:
             proxy_options: Options for the MCP proxy
             env: Environment variables to set in the container
             host_port: Host port to bind the MCP server to (auto-assigned if not specified)
+            docker_host: Docker host socket file that should be mounted on the MCP container
             add_as_default: Whether to add this MCP to the default MCPs list
 
         Returns:
@@ -223,6 +225,7 @@ class MCPManager:
             proxy_options=proxy_options or {},
             env=env or {},
             host_port=host_port,
+            docker_host=docker_host or "/var/run/docker.sock",
         )
 
         # Add to the configuration
@@ -570,7 +573,7 @@ ENTRYPOINT ["/entrypoint.sh"]
                     detach=True,
                     network=None,  # Start without network, we'll add it with aliases
                     volumes={
-                        "/var/run/docker.sock": {
+                        mcp_config.get("docker_host", "/var/run/docker.sock"): {
                             "bind": "/var/run/docker.sock",
                             "mode": "rw",
                         }

mcontainer/models.py

@@ -79,6 +79,7 @@ class ProxyMCP(BaseModel):
     proxy_options: Dict[str, Any] = Field(default_factory=dict)
     env: Dict[str, str] = Field(default_factory=dict)
     host_port: Optional[int] = None  # External port to bind the SSE port to on the host
+    docker_host: Optional[str] = None  # Docker host to use for the proxy container
 
 
 MCP = Union[RemoteMCP, DockerMCP, ProxyMCP]