didericis
96b84eb84d
One image — `bot-bottle-sidecars:latest`, built from `Dockerfile.sidecars` — served two unrelated roles: the egress/git-gate/supervise *data plane* and the orchestrator *control plane* (which ran the same image with the entrypoint overridden to `python3 -m bot_bottle.orchestrator`). The control plane is stdlib-only, so it needed none of the mitmproxy/git/gitleaks payload it was riding on — while being the most secret-dense process on the host (PRD 0070's "secret concentration"). Split into two purpose-built images: - `Dockerfile.gateway` -> `bot-bottle-gateway:latest` — the data plane (renamed from Dockerfile.sidecars; identical contents). - `Dockerfile.orchestrator` -> `bot-bottle-orchestrator:latest` — a lean `python:3.12-slim` runtime; the bind-mounted `bot_bottle` package supplies the code (so the #381 source-hash recreate semantics are unchanged). `OrchestratorService` now takes distinct `image` (control plane, default `ORCHESTRATOR_IMAGE`) and `gateway_image` (data plane, default `GATEWAY_IMAGE`) instead of feeding one `self.image` to both, and builds the lean image (build-if-missing) before starting the container. The per-bottle bundle constants in `backend/docker/sidecar_bundle.py` now alias the gateway constants so a bundle and the shared gateway can never drift onto different images. The `bot-bottle-sidecars` *image* name and `Dockerfile.sidecars` are gone; the per-bottle *container* name prefix (`bot-bottle-sidecars-<slug>`) is intentionally left for a separate change. Verified end-to-end: both images build; the lean image runs the control plane; `ensure_running` brings up the orchestrator on `bot-bottle-orchestrator:latest` and the gateway on `bot-bottle-gateway:latest` (distinct images) and reports healthy. Closes #384. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WBMWTEtQdJ4W5UrWuLHCck
118 lines
4.2 KiB
Python
118 lines
4.2 KiB
Python
"""Integration: PRD 0024 chunk 1 — the sidecar bundle image builds
|
|
and the daemon binaries are present + executable inside it.
|
|
|
|
This test does NOT exercise the daemons running against real
|
|
config (routes.yaml, etc) — that lands in chunk 2 when the
|
|
renderer wires the bundle into compose. What we verify here is
|
|
the chunk-1 contract:
|
|
|
|
- Dockerfile.gateway builds (multi-stage works, base layers
|
|
pull, COPYs resolve).
|
|
- gitleaks, mitmdump are at the documented paths and answer
|
|
`--version`.
|
|
- The Python init at /app/sidecar_init.py runs and prints the
|
|
expected "no daemons selected" line when the supervisor is
|
|
pointed at an empty daemon set.
|
|
|
|
Skips cleanly when docker is unavailable, or under act_runner
|
|
where the host bind-mount topology breaks multi-stage builds
|
|
that pull large bases.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import subprocess
|
|
import unittest
|
|
|
|
from tests._docker import skip_unless_docker
|
|
|
|
|
|
_IMAGE = "bot-bottle-gateway-test:chunk1"
|
|
_DOCKERFILE = "Dockerfile.gateway"
|
|
|
|
|
|
@skip_unless_docker()
|
|
@unittest.skipIf(
|
|
os.environ.get("GITEA_ACTIONS") == "true",
|
|
"skipped under act_runner: multi-stage build pulls a 200+MB "
|
|
"mitmproxy base + two upstream sidecar images; runner storage "
|
|
"+ time budget make this an interactive-only test",
|
|
)
|
|
class TestSidecarBundleImage(unittest.TestCase):
|
|
"""Builds the image once for the class, then runs a few
|
|
`docker run` probes against it."""
|
|
|
|
@classmethod
|
|
def setUpClass(cls) -> None:
|
|
repo_root = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
|
|
proc = subprocess.run(
|
|
["docker", "build", "-t", _IMAGE,
|
|
"-f", _DOCKERFILE, "."],
|
|
cwd=repo_root,
|
|
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
|
)
|
|
if proc.returncode != 0:
|
|
raise unittest.SkipTest(
|
|
f"docker build failed; skipping image probes.\n"
|
|
f"{proc.stdout.decode('utf-8', errors='replace')[-2000:]}"
|
|
)
|
|
|
|
@classmethod
|
|
def tearDownClass(cls) -> None:
|
|
subprocess.run(
|
|
["docker", "image", "rm", "-f", _IMAGE],
|
|
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
|
|
)
|
|
|
|
def _run_in_image(self, *cmd: str, timeout: float = 30.0) -> tuple[int, str]:
|
|
proc = subprocess.run(
|
|
["docker", "run", "--rm", "--entrypoint", cmd[0], _IMAGE,
|
|
*cmd[1:]],
|
|
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
|
timeout=timeout,
|
|
)
|
|
return proc.returncode, proc.stdout.decode("utf-8", errors="replace")
|
|
|
|
def test_gitleaks_binary_present_and_versioned(self):
|
|
rc, out = self._run_in_image("/usr/bin/gitleaks", "version")
|
|
self.assertEqual(0, rc, msg=out)
|
|
# gitleaks prints a bare version string like "v8.x.y".
|
|
self.assertRegex(out, r"v?\d+\.\d+")
|
|
|
|
def test_mitmdump_binary_present_and_versioned(self):
|
|
rc, out = self._run_in_image("mitmdump", "--version")
|
|
self.assertEqual(0, rc, msg=out)
|
|
self.assertIn("Mitmproxy", out)
|
|
|
|
def test_python_imports_supervise_module(self):
|
|
# The bundle's supervise daemon imports `supervise` as a
|
|
# same-directory sibling of `supervise_server`. Probe the
|
|
# import resolves with `python3 -c` from /app (the
|
|
# Dockerfile's WORKDIR).
|
|
rc, out = self._run_in_image(
|
|
"python3", "-c",
|
|
"import supervise; import supervise_server; print('ok')",
|
|
)
|
|
self.assertEqual(0, rc, msg=out)
|
|
self.assertIn("ok", out)
|
|
|
|
def test_init_supervisor_runs_with_no_daemons(self):
|
|
# `nothing` matches no canonical daemon → supervisor exits 0
|
|
# immediately with the documented message. Confirms the
|
|
# ENTRYPOINT wiring works.
|
|
proc = subprocess.run(
|
|
["docker", "run", "--rm",
|
|
"-e", "BOT_BOTTLE_SIDECAR_DAEMONS=nothing",
|
|
_IMAGE],
|
|
stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
|
timeout=10.0,
|
|
)
|
|
out = proc.stdout.decode("utf-8", errors="replace")
|
|
self.assertEqual(0, proc.returncode, msg=out)
|
|
self.assertIn("no daemons selected", out)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|