Add support for podman as container runtime

Author: nezhar

src/vibepod/commands/list_cmd.py

@@ -9,7 +9,8 @@
 
 from vibepod.constants import DEFAULT_IMAGES, EXIT_DOCKER_NOT_RUNNING, SUPPORTED_AGENTS
 from vibepod.core.agents import get_agent_shortcut
-from vibepod.core.docker import DockerClientError, DockerManager
+from vibepod.core.config import get_config
+from vibepod.core.docker import DockerClientError, get_manager
 from vibepod.utils.console import console, error
 
 
@@ -49,10 +50,14 @@ def list_agents(
         bool, typer.Option("-r", "--running", help="Show only running agents")
     ] = False,
     as_json: Annotated[bool, typer.Option("--json", help="Output JSON")] = False,
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
 ) -> None:
     """List available agents and running containers."""
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=get_config())
         containers = manager.list_managed(all_containers=True)
     except DockerClientError as exc:
         if running:

src/vibepod/commands/logs.py

@@ -10,7 +10,7 @@
 
 from vibepod.constants import EXIT_DOCKER_NOT_RUNNING
 from vibepod.core.config import get_config
-from vibepod.core.docker import DockerClientError, DockerManager
+from vibepod.core.docker import DockerClientError, get_manager
 from vibepod.utils.console import error, info, success, warning
 
 app = typer.Typer(help="View logs and traffic UI")
@@ -20,6 +20,10 @@
 def logs_start(
     port: Annotated[int | None, typer.Option("--port", help="Datasette host port")] = None,
     no_open: Annotated[bool, typer.Option("--no-open", help="Do not open browser")] = False,
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
 ) -> None:
     """Start or reuse Datasette for session and proxy logs."""
     config = get_config()
@@ -34,7 +38,7 @@ def logs_start(
     ).expanduser()
 
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=config)
     except DockerClientError as exc:
         error(str(exc))
         raise typer.Exit(EXIT_DOCKER_NOT_RUNNING) from exc
@@ -55,10 +59,14 @@ def logs_start(
 @app.command("stop")
 def logs_stop(
     force: Annotated[bool, typer.Option("-f", "--force", help="Force stop")] = False,
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
 ) -> None:
     """Stop the Datasette container."""
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=get_config())
     except DockerClientError as exc:
         error(str(exc))
         raise typer.Exit(EXIT_DOCKER_NOT_RUNNING) from exc
@@ -73,10 +81,15 @@ def logs_stop(
 
 
 @app.command("status")
-def logs_status() -> None:
+def logs_status(
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
+) -> None:
     """Show Datasette container status."""
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=get_config())
     except DockerClientError as exc:
         error(str(exc))
         raise typer.Exit(EXIT_DOCKER_NOT_RUNNING) from exc
@@ -94,6 +107,10 @@ def logs_status() -> None:
 def logs_ui(
     port: Annotated[int | None, typer.Option("--port", help="Datasette host port")] = None,
     no_open: Annotated[bool, typer.Option("--no-open", help="Do not open browser")] = False,
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
 ) -> None:
     """Alias for `vp logs start`."""
-    logs_start(port=port, no_open=no_open)
+    logs_start(port=port, no_open=no_open, runtime=runtime)

src/vibepod/commands/proxy.py

@@ -9,14 +9,19 @@
 
 from vibepod.constants import EXIT_DOCKER_NOT_RUNNING
 from vibepod.core.config import get_config
-from vibepod.core.docker import DockerClientError, DockerManager
+from vibepod.core.docker import DockerClientError, get_manager
 from vibepod.utils.console import error, info, success, warning
 
 app = typer.Typer(help="Manage the HTTP(S) proxy")
 
 
 @app.command("start")
-def proxy_start() -> None:
+def proxy_start(
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
+) -> None:
     """Start the proxy container."""
     config = get_config()
     proxy_cfg = config.get("proxy", {})
@@ -35,7 +40,7 @@ def proxy_start() -> None:
     network_name = str(config.get("network", "vibepod-network"))
 
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=config)
     except DockerClientError as exc:
         error(str(exc))
         raise typer.Exit(EXIT_DOCKER_NOT_RUNNING) from exc
@@ -55,10 +60,14 @@ def proxy_start() -> None:
 @app.command("stop")
 def proxy_stop(
     force: Annotated[bool, typer.Option("-f", "--force", help="Force stop")] = False,
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
 ) -> None:
     """Stop the proxy container."""
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=get_config())
     except DockerClientError as exc:
         error(str(exc))
         raise typer.Exit(EXIT_DOCKER_NOT_RUNNING) from exc
@@ -73,10 +82,15 @@ def proxy_stop(
 
 
 @app.command("status")
-def proxy_status() -> None:
+def proxy_status(
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
+) -> None:
     """Show proxy container status."""
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=get_config())
     except DockerClientError as exc:
         error(str(exc))
         raise typer.Exit(EXIT_DOCKER_NOT_RUNNING) from exc

src/vibepod/commands/run.py

@@ -14,7 +14,7 @@
 from rich.prompt import Confirm, Prompt
 
 from vibepod import __version__
-from vibepod.constants import EXIT_DOCKER_NOT_RUNNING, SUPPORTED_AGENTS
+from vibepod.constants import EXIT_DOCKER_NOT_RUNNING, RUNTIME_PODMAN, SUPPORTED_AGENTS
 from vibepod.core.agents import (
     agent_config_dir,
     effective_agent_image,
@@ -23,7 +23,7 @@
     resolve_agent_name,
 )
 from vibepod.core.config import get_config
-from vibepod.core.docker import DockerClientError, DockerManager
+from vibepod.core.docker import DockerClientError, DockerManager, get_manager
 from vibepod.core.session_logger import SessionLogger
 from vibepod.utils.console import error, info, success, warning
 
@@ -214,6 +214,10 @@ def run(
         str | None,
         typer.Option("--network", help="Additional Docker network to connect the container to"),
     ] = None,
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
 ) -> None:
     """Start an agent container."""
     config = get_config()
@@ -247,7 +251,7 @@ def run(
     image = effective_agent_image(selected_agent, config)
 
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=config)
     except DockerClientError as exc:
         error(str(exc))
         raise typer.Exit(EXIT_DOCKER_NOT_RUNNING) from exc
@@ -266,14 +270,30 @@ def run(
 
     command = spec.command
     entrypoint: list[str] | None = None
-    if init_commands:
-        info(f"Applying {len(init_commands)} init command(s) before startup")
+
+    # On rootless Podman the container starts as root (mapped from the host
+    # UID) but often switches to a non-root user via su/gosu.  That non-root
+    # user gets a subordinate UID that can't read files owned by root inside
+    # the container.  Injecting a chmod before the real entrypoint ensures the
+    # config mount is accessible after the user switch.
+    podman_fixup: list[str] = []
+    if manager.runtime == RUNTIME_PODMAN:
+        paths_to_fix = [spec.config_mount_path]
+        extra_volumes_pre = _agent_extra_volumes(selected_agent, agent_config_dir(selected_agent))
+        if extra_volumes_pre:
+            paths_to_fix.extend(cp for _, cp, _ in extra_volumes_pre)
+        quoted = " ".join(f"'{p}'" for p in dict.fromkeys(paths_to_fix))
+        podman_fixup = [f"chmod -R a+rwX {quoted} 2>/dev/null || true"]
+
+    if init_commands or podman_fixup:
+        if init_commands:
+            info(f"Applying {len(init_commands)} init command(s) before startup")
         try:
             command = manager.resolve_launch_command(image=image, command=spec.command)
         except DockerClientError as exc:
             error(str(exc))
             raise typer.Exit(1) from exc
-        entrypoint = _init_entrypoint(init_commands)
+        entrypoint = _init_entrypoint(podman_fixup + init_commands)
 
     config_dir = agent_config_dir(selected_agent)
     config_dir.mkdir(parents=True, exist_ok=True)

src/vibepod/commands/stop.py

@@ -7,7 +7,8 @@
 import typer
 
 from vibepod.constants import EXIT_DOCKER_NOT_RUNNING
-from vibepod.core.docker import DockerClientError, DockerManager
+from vibepod.core.config import get_config
+from vibepod.core.docker import DockerClientError, get_manager
 from vibepod.utils.console import error, success
 
 
@@ -18,13 +19,17 @@ def stop(
         typer.Option("-a", "--all", help="Stop all VibePod managed containers"),
     ] = False,
     force: Annotated[bool, typer.Option("-f", "--force", help="Force stop")] = False,
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
 ) -> None:
     """Stop one agent container, or all managed containers."""
     if not all_containers and agent is None:
         raise typer.BadParameter("Provide an AGENT or use --all")
 
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime, config=get_config())
     except DockerClientError as exc:
         error(str(exc))
         raise typer.Exit(EXIT_DOCKER_NOT_RUNNING) from exc

src/vibepod/commands/update.py

@@ -8,26 +8,34 @@
 import typer
 
 from vibepod import __version__
-from vibepod.core.docker import DockerClientError, DockerManager
+from vibepod.core.config import get_config
+from vibepod.core.docker import DockerClientError, get_manager
 
 
-def _docker_version() -> str:
+def _runtime_version(runtime_override: str | None = None) -> tuple[str, str]:
+    """Return (runtime_name, version_string)."""
     try:
-        manager = DockerManager()
+        manager = get_manager(runtime_override=runtime_override, config=get_config())
         version_info: dict[str, Any] = manager.client.version()
-        return str(version_info.get("Version", "unknown"))
+        return manager.runtime, str(version_info.get("Version", "unknown"))
     except DockerClientError:
-        return "unavailable"
+        return "unknown", "unavailable"
 
 
 def version(
     as_json: Annotated[bool, typer.Option("--json", help="Output as JSON")] = False,
+    runtime: Annotated[
+        str | None,
+        typer.Option("--runtime", help="Container runtime to use (docker or podman)"),
+    ] = None,
 ) -> None:
     """Show version and runtime information."""
+    rt_name, rt_version = _runtime_version(runtime_override=runtime)
     info = {
         "vibepod": __version__,
         "python": platform.python_version(),
-        "docker": _docker_version(),
+        "runtime": rt_name,
+        "runtime_version": rt_version,
     }
 
     if as_json:
@@ -38,4 +46,4 @@ def version(
 
     print(f"VibePod CLI: {info['vibepod']}")
     print(f"Python:      {info['python']}")
-    print(f"Docker:      {info['docker']}")
+    print(f"Runtime:     {info['runtime']} {info['runtime_version']}")

src/vibepod/constants.py

@@ -18,6 +18,16 @@
 DOCKER_NETWORK = "vibepod-network"
 CONTAINER_LABEL_MANAGED = "vibepod.managed"
 
+# Container runtime constants
+RUNTIME_AUTO = "auto"
+RUNTIME_DOCKER = "docker"
+RUNTIME_PODMAN = "podman"
+SUPPORTED_RUNTIMES = (RUNTIME_DOCKER, RUNTIME_PODMAN)
+
+DOCKER_SOCKET = "unix:///var/run/docker.sock"
+PODMAN_SOCKET_ROOTLESS = "unix:///run/user/{uid}/podman/podman.sock"
+PODMAN_SOCKET_ROOTFUL = "unix:///run/podman/podman.sock"
+
 SUPPORTED_AGENTS = (
     "claude",
     "gemini",

src/vibepod/core/config.py

@@ -13,6 +13,7 @@
     DEFAULT_ALIASES,
     DEFAULT_IMAGES,
     PROJECT_CONFIG_FILE,
+    RUNTIME_AUTO,
 )
 
 
@@ -30,6 +31,7 @@ def _default_config() -> dict[str, Any]:
         "version": 1,
         "default_agent": "claude",
         "auto_pull": True,
+        "container_runtime": RUNTIME_AUTO,
         "auto_remove": True,
         "network": "vibepod-network",
         "log_level": "info",
@@ -141,6 +143,7 @@ def deep_merge(base: dict[str, Any], override: dict[str, Any]) -> dict[str, Any]
 def _apply_env(config: dict[str, Any]) -> dict[str, Any]:
     mappings: dict[str, tuple[str, Any]] = {
         "VP_DEFAULT_AGENT": ("default_agent", str),
+        "VP_CONTAINER_RUNTIME": ("container_runtime", str),
         "VP_AUTO_PULL": ("auto_pull", lambda x: x.lower() == "true"),
         "VP_LOG_LEVEL": ("log_level", str),
         "VP_NO_COLOR": ("no_color", lambda x: x.lower() == "true"),