feat(docker): split orchestrator and gateway into separate containers (PRD 0070)

Now that #469 got the DB off the data plane, the docker backend runs the
control plane and data plane as two containers instead of the combined
`bot-bottle-infra` container:

  * bot-bottle-orchestrator — the lean control-plane container (image
    Dockerfile.orchestrator, `-m bot_bottle.orchestrator`). Joins the new
    `bot-bottle-orchestrator` control network (`--internal`) only, plus a
    host-loopback publish for the CLI. Sole opener of bot-bottle.db; holds the
    signing key; no CA, no gateway daemons.
  * bot-bottle-orch-gateway — the data-plane container (DockerGateway),
    dual-homed on the agent `bot-bottle-gateway` network AND the control
    network, so it resolves the orchestrator by name
    (http://bot-bottle-orchestrator:8099) while agents — never on the control
    network — have no route to the control plane (the L3 block, not just the
    JWT). Holds the gateway JWT + the mitmproxy CA.

DockerInfraService now orchestrates the pair (builds gateway + orchestrator
images, brings up the orchestrator then the gateway) and exposes gateway_name;
the launch flow attributes agents against the gateway container. DockerGateway
gains a control_network it joins after run. rotate_ca / the CA read target the
gateway container. The combined Dockerfile.infra is no longer built by docker
(firecracker/macOS still use it until their splits).

pyright 0 errors; unit suite green (2273). Integration tests updated for the
two-container shape but need a real-docker run to validate the networking.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

bot_bottle/backend/docker/infra.py

@@ -1,19 +1,22 @@
-"""The per-host infra container for the docker backend (PRD 0070).
+"""The per-host control plane + gateway for the docker backend (PRD 0070).
 
-Runs both the orchestrator control plane and the gateway data plane inside a
-single `bot-bottle-infra` container on the shared gateway network — the docker
-analogue of the macOS infra container (`backend/macos_container/infra.py`) and
-the Firecracker infra VM (`backend/firecracker/infra_vm.py`). `gateway_init` is
-PID 1 and supervises both; the infra container is an idempotent per-host
-singleton.
+Runs the orchestrator (control plane) and the gateway (data plane) as **two
+separate containers**, split now that #469 got the DB off the data plane:
 
-The combined container replaces the prior two-container split
-(bot-bottle-orchestrator + bot-bottle-orch-gateway). The host CLI reaches the
-control plane via a published loopback port; gateway daemons reach it over
-127.0.0.1 (same container).
+  * `bot-bottle-orchestrator` — the lean control-plane container. Joins the
+    `bot-bottle-orchestrator` **control network** (`--internal`) only, plus a
+    host-loopback publish for the CLI. Sole opener of `bot-bottle.db`; holds the
+    signing key.
+  * `bot-bottle-gateway` — the data-plane container (`DockerGateway`).
+    **Dual-homed** on the agent-facing `bot-bottle-gateway` network *and* the
+    control network, so it reaches the orchestrator by name over docker DNS
+    (`http://bot-bottle-orchestrator:8099`) while agents — which are never on
+    the control network — cannot reach the control plane at all (the L3 block
+    Firecracker's nft already has). Holds the `gateway` JWT + the mitmproxy CA.
 
-The shared, backend-neutral pieces (control-plane port, startup timeout,
-`OrchestratorStartError`, `source_hash`) live in `orchestrator.lifecycle`.
+`DockerInfraService` brings both up as an idempotent per-host pair. Callers use
+`ensure_running()` (returns the host control-plane URL) + `gateway_name` (the
+container the launch flow attributes agents against).
 """
 
 from __future__ import annotations
@@ -25,21 +28,19 @@ import urllib.request
 from pathlib import Path
 
 from ... import log
-from ...orchestrator_auth import ROLE_GATEWAY, mint
 from .util import run_docker
+from .gateway import DockerGateway
 from ...paths import (
-    ORCHESTRATOR_AUTH_JWT_ENV,
     ORCHESTRATOR_TOKEN_ENV,
     bot_bottle_root,
     host_orchestrator_token,
-    host_gateway_ca_dir,
 )
 from ...gateway import (
     GATEWAY_DOCKERFILE,
     GATEWAY_IMAGE,
+    GATEWAY_NAME,
     GATEWAY_NETWORK,
     GatewayError,
-    MITMPROXY_HOME,
 )
 from ...orchestrator.lifecycle import (
     DEFAULT_PORT,
@@ -48,39 +49,39 @@ from ...orchestrator.lifecycle import (
     source_hash,
 )
 
-INFRA_NAME = "bot-bottle-infra"
-INFRA_LABEL = "bot-bottle-infra=1"
-# The combined infra image: gateway data plane + orchestrator content.
-# Built from Dockerfile.infra (FROM gateway + COPY --from orchestrator).
-INFRA_IMAGE = os.environ.get("BOT_BOTTLE_INFRA_IMAGE", "bot-bottle-infra:latest")
-INFRA_DOCKERFILE = "Dockerfile.infra"
-# Baked as a container label so `ensure_running` can detect whether the
-# running container is executing the current bind-mounted source.
-INFRA_SOURCE_HASH_LABEL = "bot-bottle-infra-source-hash"
-
-# Orchestrator image: the single canonical definition of the control-plane
-# content (lean: python:3.12-slim + bot_bottle package, no mitmproxy/git).
-# Used as a build intermediate: `Dockerfile.infra` COPY --from this image.
+# The control plane's own container + the dedicated control network the gateway
+# reaches it over. The network is created `--internal`: the orchestrator and
+# gateway join it, agents never do, so agents have no route to the control
+# plane (PRD 0070 "Separating the planes"). Same name across docker + macOS.
+ORCHESTRATOR_NAME = "bot-bottle-orchestrator"
+ORCHESTRATOR_LABEL = "bot-bottle-orchestrator=1"
+ORCHESTRATOR_NETWORK = "bot-bottle-orchestrator"
 ORCHESTRATOR_IMAGE = os.environ.get(
     "BOT_BOTTLE_ORCHESTRATOR_IMAGE", "bot-bottle-orchestrator:latest"
 )
 ORCHESTRATOR_DOCKERFILE = "Dockerfile.orchestrator"
+# Baked as a container label so `ensure_running` can detect whether the running
+# orchestrator is executing the current bind-mounted source.
+ORCHESTRATOR_SOURCE_HASH_LABEL = "bot-bottle-orchestrator-source-hash"
 
-# The gateway daemons + orchestrator the infra container runs.
-# BOT_BOTTLE_GATEWAY_DAEMONS listing `orchestrator` opts it in to
-# gateway_init's supervise tree (see gateway_init._OPT_IN_DAEMONS).
-_INFRA_DAEMONS = "egress,git-http,supervise,orchestrator"
-
-# The bind-mount path for the live control-plane source inside the
-# container. Separate from /app so the gateway's baked scripts
-# (egress_addon.py, egress-entrypoint.sh) are not overlaid.
+# The bind-mount path for the live control-plane source inside the orchestrator
+# container. PYTHONPATH points here so a code change takes effect on the next
+# launch without an image rebuild.
 _SRC_IN_CONTAINER = "/bot-bottle-src"
-# Bot-bottle host-root bind-mount inside the container (DB + state). The
-# orchestrator control plane opens bot-bottle.db under here (via BOT_BOTTLE_ROOT
-# -> host_db_path()); it is the ONLY process in the container with a file
-# handle on it (PRD 0070 / issue #469).
+# Bot-bottle host-root bind-mount (DB + state) inside the orchestrator. The
+# control plane opens bot-bottle.db under here (via BOT_BOTTLE_ROOT ->
+# host_db_path()); it is the ONLY container with a handle on it (issue #469).
 _ROOT_IN_CONTAINER = "/bot-bottle-root"
 
+# The URL the gateway's data plane resolves policy against — the orchestrator
+# container by name on the control network (docker DNS, container↔container).
+ORCHESTRATOR_URL_IN_NETWORK = f"http://{ORCHESTRATOR_NAME}:{DEFAULT_PORT}"
+
+# Back-compat aliases: the split retired the combined `bot-bottle-infra`
+# container, but the fixed-name constants some callers/tests import still map to
+# the pair's public identity.
+INFRA_NAME = GATEWAY_NAME  # the container agents attribute against is the gateway
+
 _HEALTH_POLL_SECONDS = 0.25
 _HEALTH_REQUEST_TIMEOUT_SECONDS = 1.0
 
@@ -88,35 +89,46 @@ _REPO_ROOT = Path(__file__).resolve().parents[3]
 
 
 class DockerInfraService:
-    """Manages the single per-host docker infra container (control plane +
-    gateway). Callers only need `ensure_running()` + `url`.
+    """Brings up the per-host control plane + gateway as two containers.
 
-    `infra_name` / `infra_label` let callers run independent infra containers
-    on the same host without name collisions (e.g. isolated integration tests
-    that can't share the production INFRA_NAME singleton)."""
+    `orchestrator_name` / `gateway_name` let callers run independent pairs on
+    one host without name collisions (e.g. isolated integration tests that
+    can't share the production singletons)."""
 
     def __init__(
         self,
         *,
         port: int = DEFAULT_PORT,
         network: str = GATEWAY_NETWORK,
-        image: str = INFRA_IMAGE,
+        control_network: str = ORCHESTRATOR_NETWORK,
+        orchestrator_image: str = ORCHESTRATOR_IMAGE,
+        gateway_image: str = GATEWAY_IMAGE,
         repo_root: Path = _REPO_ROOT,
         host_root: Path | None = None,
-        infra_name: str = INFRA_NAME,
-        infra_label: str = INFRA_LABEL,
+        orchestrator_name: str = ORCHESTRATOR_NAME,
+        orchestrator_label: str = ORCHESTRATOR_LABEL,
+        gateway_name: str = GATEWAY_NAME,
     ) -> None:
         self.port = port
         self.network = network
-        self.image = image
+        self.control_network = control_network
+        self.orchestrator_image = orchestrator_image
+        self.gateway_image = gateway_image
         self._repo_root = repo_root
         self._host_root = host_root or bot_bottle_root()
-        self._infra_name = infra_name
-        self._infra_label = infra_label
+        self._orchestrator_name = orchestrator_name
+        self._orchestrator_label = orchestrator_label
+        self._gateway_name = gateway_name
+
+    @property
+    def gateway_name(self) -> str:
+        """The gateway container — the address the launch flow attributes agents
+        against (gateway IP, git-gate provisioning transport, CA fetch)."""
+        return self._gateway_name
 
     @property
     def url(self) -> str:
-        """Host-side control-plane URL (published loopback port)."""
+        """Host-side control-plane URL (the orchestrator's published loopback)."""
         return f"http://127.0.0.1:{self.port}"
 
     def is_healthy(self, *, timeout: float = _HEALTH_REQUEST_TIMEOUT_SECONDS) -> bool:
@@ -130,36 +142,38 @@ class DockerInfraService:
         proc = run_docker(["docker", "ps", "--filter", f"name=^/{name}$", "--format", "{{.Names}}"])
         return name in proc.stdout.split()
 
-    def _infra_source_current(self, current_hash: str) -> bool:
-        """True iff the running infra container was started from the current
-        bind-mounted source. Mirrors the macOS backend's `_source_current`."""
-        if not self._container_running(self._infra_name):
+    def _orchestrator_source_current(self, current_hash: str) -> bool:
+        """True iff the running orchestrator was started from the current
+        bind-mounted source."""
+        if not self._container_running(self._orchestrator_name):
             return False
         proc = run_docker([
             "docker", "inspect", "--format",
-            "{{ index .Config.Labels \"" + INFRA_SOURCE_HASH_LABEL + "\" }}",
-            self._infra_name,
+            "{{ index .Config.Labels \"" + ORCHESTRATOR_SOURCE_HASH_LABEL + "\" }}",
+            self._orchestrator_name,
         ])
         if proc.returncode != 0:
             return True  # can't compare → don't churn a working container
         return proc.stdout.strip() == current_hash
 
-    def _ensure_network(self) -> None:
-        if run_docker(["docker", "network", "inspect", self.network]).returncode == 0:
+    def _ensure_network(self, name: str, *, internal: bool) -> None:
+        if run_docker(["docker", "network", "inspect", name]).returncode == 0:
             return
-        proc = run_docker(["docker", "network", "create", self.network])
+        argv = ["docker", "network", "create"]
+        if internal:
+            argv.append("--internal")
+        argv.append(name)
+        proc = run_docker(argv)
         if proc.returncode != 0 and "already exists" not in proc.stderr:
-            raise GatewayError(
-                f"gateway network {self.network} failed to create: {proc.stderr.strip()}"
-            )
+            raise GatewayError(f"network {name} failed to create: {proc.stderr.strip()}")
 
     def _build_images(self) -> None:
-        """Build the gateway base, the orchestrator intermediate, then the
-        infra image. All are cache-aware: a no-op when nothing changed."""
+        """Build the gateway (data plane) and orchestrator (control plane)
+        images. Cache-aware: a no-op when nothing changed. The combined
+        `Dockerfile.infra` is no longer built — the planes ship as two images."""
         for tag, dockerfile in (
-            (GATEWAY_IMAGE, GATEWAY_DOCKERFILE),
-            (ORCHESTRATOR_IMAGE, ORCHESTRATOR_DOCKERFILE),
-            (self.image, INFRA_DOCKERFILE),
+            (self.gateway_image, GATEWAY_DOCKERFILE),
+            (self.orchestrator_image, ORCHESTRATOR_DOCKERFILE),
         ):
             argv = ["docker", "build", "-t", tag,
                     "-f", str(self._repo_root / dockerfile),
@@ -170,92 +184,102 @@ class DockerInfraService:
             if proc.returncode != 0:
                 raise GatewayError(f"{dockerfile} build failed: {proc.stderr.strip()}")
 
-    def _run_infra_container(self, current_hash: str) -> None:
-        """Start the combined infra container (idempotent: clears a stale
-        fixed-name container first). Labels the container with `current_hash`
-        so a later `ensure_running` can detect a real code change."""
-        self._ensure_network()
-        run_docker(["docker", "rm", "--force", self._infra_name])
+    def _run_orchestrator_container(self, current_hash: str) -> None:
+        """Start the lean control-plane container on the control network only,
+        published to host loopback for the CLI. Idempotent (clears a stale
+        fixed-name container first)."""
+        self._ensure_network(self.control_network, internal=True)
+        run_docker(["docker", "rm", "--force", self._orchestrator_name])
         _signing_key = host_orchestrator_token()
         proc = run_docker([
             "docker", "run", "--detach",
-            "--name", self._infra_name,
-            "--label", self._infra_label,
-            "--label", f"{INFRA_SOURCE_HASH_LABEL}={current_hash}",
-            "--network", self.network,
-            # Host CLI reaches the control plane here (loopback only).
-            # gateway_init always starts the orchestrator on DEFAULT_PORT (8099)
-            # inside the container; self.port is the host-side published port.
+            "--name", self._orchestrator_name,
+            "--label", self._orchestrator_label,
+            "--label", f"{ORCHESTRATOR_SOURCE_HASH_LABEL}={current_hash}",
+            # Control network only — agents are never on it, so they have no
+            # route to the control plane (the L3 block, not just the JWT).
+            "--network", self.control_network,
+            # Host CLI reaches the control plane here (loopback only). The
+            # orchestrator listens on the fixed DEFAULT_PORT inside the
+            # container; self.port is the host-side published port.
             "--publish", f"127.0.0.1:{self.port}:{DEFAULT_PORT}",
-            # Persist the mitmproxy CA on the host so it survives container
-            # recreation AND docker volume pruning (issue #450): every agent
-            # trusts this one CA, so a fresh one would break all running bottles.
-            "--volume", f"{host_gateway_ca_dir()}:{MITMPROXY_HOME}",
-            # Live control-plane source, mounted to a path that does not
-            # overlay the gateway's baked /app scripts.
+            # Live control-plane source (code changes without an image rebuild).
             "--volume", f"{self._repo_root}:{_SRC_IN_CONTAINER}:ro",
-            # PYTHONPATH lets the orchestrator (and other Python daemons)
-            # import the live source ahead of the installed package.
             "--env", f"PYTHONPATH={_SRC_IN_CONTAINER}",
             # Orchestrator registry DB on the host (sole writer: control plane).
             "--volume", f"{self._host_root}:{_ROOT_IN_CONTAINER}",
             "--env", f"BOT_BOTTLE_ROOT={_ROOT_IN_CONTAINER}",
-            # Control-plane signing key (orchestrator: verifies tokens) + the
-            # pre-minted `gateway` JWT (data-plane daemons: present it). gateway_init
-            # scopes each to its process, so a compromised data-plane daemon never
-            # sees the key and can't mint a `cli` token (issue #469 review).
+            # The signing key — held ONLY by the orchestrator (it verifies
+            # tokens); the gateway gets the pre-minted `gateway` JWT, never the
+            # key (issue #469). Bare `--env NAME` keeps the value off argv.
             "--env", ORCHESTRATOR_TOKEN_ENV,
-            "--env", ORCHESTRATOR_AUTH_JWT_ENV,
-            # Gateway daemons reach the orchestrator over loopback at its
-            # fixed internal port (DEFAULT_PORT), independent of self.port.
-            "--env", f"BOT_BOTTLE_ORCHESTRATOR_URL=http://127.0.0.1:{DEFAULT_PORT}",
-            # Opt the orchestrator into gateway_init's supervise tree.
-            "--env", f"BOT_BOTTLE_GATEWAY_DAEMONS={_INFRA_DAEMONS}",
-            self.image,
-        ], env={
-            **os.environ,
-            ORCHESTRATOR_TOKEN_ENV: _signing_key,
-            ORCHESTRATOR_AUTH_JWT_ENV: mint(ROLE_GATEWAY, _signing_key),
-        })
+            self.orchestrator_image,
+            # Dockerfile.orchestrator ENTRYPOINT is `python3 -m bot_bottle.orchestrator`;
+            # these are its args.
+            "--host", "0.0.0.0", "--port", str(DEFAULT_PORT), "--broker", "stub",
+        ], env={**os.environ, ORCHESTRATOR_TOKEN_ENV: _signing_key})
         if proc.returncode != 0:
             raise OrchestratorStartError(
-                f"infra container failed to start: {proc.stderr.strip()}"
+                f"orchestrator container failed to start: {proc.stderr.strip()}"
             )
 
+    def _gateway(self) -> DockerGateway:
+        """The data-plane gateway, dual-homed on the agent network + the control
+        network, resolving policy against the orchestrator by name."""
+        return DockerGateway(
+            self.gateway_image,
+            name=self._gateway_name,
+            network=self.network,
+            control_network=self.control_network,
+            orchestrator_url=ORCHESTRATOR_URL_IN_NETWORK,
+            build_context=self._repo_root,
+            dockerfile=None,  # images are built by _build_images
+        )
+
     def ensure_running(
         self, *, startup_timeout: float = DEFAULT_STARTUP_TIMEOUT_SECONDS,
     ) -> str:
-        """Ensure the infra container (control plane + gateway) is up; return
-        the host control-plane URL. Idempotent — a healthy container on current
-        source is left untouched. Raises `OrchestratorStartError` on timeout."""
+        """Ensure the orchestrator + gateway containers are up; return the host
+        control-plane URL. Idempotent — a healthy orchestrator on current source
+        (and a current-image gateway) is left untouched. Raises
+        `OrchestratorStartError` on control-plane startup timeout."""
         self._build_images()
+        self._ensure_network(self.network, internal=False)
 
         current_hash = source_hash(self._repo_root)
-        if self.is_healthy() and self._infra_source_current(current_hash):
-            return self.url
+        if not (self.is_healthy() and self._orchestrator_source_current(current_hash)):
+            log.info("starting orchestrator container",
+                     context={"name": self._orchestrator_name})
+            self._run_orchestrator_container(current_hash)
 
-        log.info("starting infra container", context={"name": self._infra_name})
-        self._run_infra_container(current_hash)
+            deadline = time.monotonic() + startup_timeout
+            while time.monotonic() < deadline:
+                if self.is_healthy():
+                    log.info("orchestrator healthy", context={"url": self.url})
+                    break
+                time.sleep(_HEALTH_POLL_SECONDS)
+            else:
+                raise OrchestratorStartError(
+                    f"orchestrator at {self.url} did not become healthy "
+                    f"within {startup_timeout:g}s"
+                )
 
-        deadline = time.monotonic() + startup_timeout
-        while time.monotonic() < deadline:
-            if self.is_healthy():
-                log.info("infra container healthy", context={"url": self.url})
-                return self.url
-            time.sleep(_HEALTH_POLL_SECONDS)
-        raise OrchestratorStartError(
-            f"infra container at {self.url} did not become healthy within {startup_timeout:g}s"
-        )
+        # Bring up (or refresh) the gateway once the control plane it resolves
+        # against is healthy. `ensure_running` is itself idempotent.
+        self._gateway().ensure_running()
+        return self.url
 
     def stop(self) -> None:
-        """Remove the infra container (idempotent)."""
-        run_docker(["docker", "rm", "--force", self._infra_name])
+        """Remove both containers (idempotent)."""
+        run_docker(["docker", "rm", "--force", self._gateway_name])
+        run_docker(["docker", "rm", "--force", self._orchestrator_name])
 
 
 __all__ = [
     "DockerInfraService",
-    "INFRA_NAME",
-    "INFRA_IMAGE",
-    "INFRA_SOURCE_HASH_LABEL",
+    "ORCHESTRATOR_NAME",
+    "ORCHESTRATOR_NETWORK",
     "ORCHESTRATOR_IMAGE",
+    "ORCHESTRATOR_SOURCE_HASH_LABEL",
+    "INFRA_NAME",
 ]