didericis
70a22fa210
test / run tests/run_tests.py (pull_request) Successful in 21s
Across the package: - claude_bottle/platform/ -> claude_bottle/backend/ - platform/docker/platform.py -> backend/docker/backend.py - class BottlePlatform -> BottleBackend - class DockerBottlePlatform -> DockerBottleBackend - get_bottle_platform() -> get_bottle_backend() - env var CLAUDE_BOTTLE_PLATFORM -> CLAUDE_BOTTLE_BACKEND - dict _PLATFORMS -> _BACKENDS "Backend" is shorter and more established as the term for a pluggable strategy-pattern implementation. "Platform" was vague (could mean OS, hardware, cloud) and mildly redundant — Docker is itself a platform. The previous PRD section claiming "the Backend protocol was rejected" referred to a low-level run/exec/cp/network_connect protocol; the name was never the reason. The PRD is updated to describe that rejected design by shape rather than by name. The bottle/agent concepts and the manifest schema are unchanged.
108 lines
3.6 KiB
Python
108 lines
3.6 KiB
Python
"""Docker network plumbing for the per-agent egress-proxy topology.
|
|
|
|
The agent container sits on a Docker `--internal` network (no default
|
|
gateway). Pipelock straddles that network and a per-agent user-defined
|
|
bridge for upstream egress. We deliberately do NOT use Docker's legacy
|
|
`bridge` network because only user-defined bridges run Docker's
|
|
embedded DNS resolver, which pipelock needs to resolve api.anthropic.com
|
|
and similar upstream hostnames.
|
|
|
|
Naming: claude-bottle-net-<slug> (internal),
|
|
claude-bottle-egress-<slug> (egress). Numeric suffix on conflict
|
|
(-2, -3, ..., capped at 100).
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
|
|
from ...log import die, info, warn
|
|
|
|
|
|
def network_name_for_slug(slug: str) -> str:
|
|
return f"claude-bottle-net-{slug}"
|
|
|
|
|
|
def network_egress_name_for_slug(slug: str) -> str:
|
|
return f"claude-bottle-egress-{slug}"
|
|
|
|
|
|
def network_exists(name: str) -> bool:
|
|
"""Uses `docker network inspect`, not `docker network ls -f name=...`,
|
|
because the latter does substring matching."""
|
|
return (
|
|
subprocess.run(
|
|
["docker", "network", "inspect", name],
|
|
stdout=subprocess.DEVNULL,
|
|
stderr=subprocess.DEVNULL,
|
|
).returncode
|
|
== 0
|
|
)
|
|
|
|
|
|
def _network_create_with_prefix(base: str, internal: bool) -> str:
|
|
"""Create a per-agent Docker network whose name is <base> (with
|
|
-2, -3, ... appended on conflict, capped at 100). Returns the
|
|
resolved name."""
|
|
name = base
|
|
suffix = 2
|
|
while network_exists(name):
|
|
name = f"{base}-{suffix}"
|
|
suffix += 1
|
|
if suffix > 100:
|
|
die(
|
|
f"could not find a free network name after {base}-99; "
|
|
f"clean up old networks with 'docker network rm <name>'"
|
|
)
|
|
|
|
kind = "internal" if internal else "bridge (egress)"
|
|
args = ["docker", "network", "create"]
|
|
if internal:
|
|
args.append("--internal")
|
|
args.append(name)
|
|
info(f"creating {kind} network {name}")
|
|
result = subprocess.run(args, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
|
|
if result.returncode != 0:
|
|
flag = " --internal" if internal else ""
|
|
die(f"docker network create{flag} {name} failed")
|
|
return name
|
|
|
|
|
|
def network_create_internal(slug: str) -> str:
|
|
"""Create a Docker `--internal` network for the agent. Returns the
|
|
resolved name."""
|
|
return _network_create_with_prefix(network_name_for_slug(slug), internal=True)
|
|
|
|
|
|
def network_create_egress(slug: str) -> str:
|
|
"""Create a per-agent user-defined bridge (NOT the legacy `bridge`)
|
|
so the pipelock sidecar has working DNS for upstream hostnames."""
|
|
return _network_create_with_prefix(network_egress_name_for_slug(slug), internal=False)
|
|
|
|
|
|
def network_attach(network: str, container: str) -> None:
|
|
result = subprocess.run(
|
|
["docker", "network", "connect", network, container],
|
|
stdout=subprocess.DEVNULL,
|
|
stderr=subprocess.DEVNULL,
|
|
)
|
|
if result.returncode != 0:
|
|
die(f"docker network connect {network} {container} failed")
|
|
|
|
|
|
def network_remove(name: str) -> bool:
|
|
"""Idempotent: a missing network is treated as success so this can
|
|
be called from a teardown trap. Returns True if removal succeeded
|
|
(or the network was already gone)."""
|
|
if not network_exists(name):
|
|
return True
|
|
result = subprocess.run(
|
|
["docker", "network", "rm", name],
|
|
stdout=subprocess.DEVNULL,
|
|
stderr=subprocess.DEVNULL,
|
|
)
|
|
if result.returncode != 0:
|
|
warn(f"failed to remove network {name}; clean up with 'docker network rm {name}'")
|
|
return False
|
|
return True
|