mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-07 19:32:17 +00:00
kevinveenbirkenbachandClaude Opus 4.7
3e31630d58
Two related improvements anchored on the same principle: the env var
INFINITO_DISTRO is the single source of truth for the development distro,
and INFINITO_CONTAINER is purely derived from it.
1. Fix the matrix-deploy purge failure (CI run 24942172018, job 73038526513,
web-app-wordpress @ fedora):
scripts/meta/env/defaults.sh eager-exported INFINITO_CONTAINER once
inside its load-once guard; ci/all.sh's iteration loop re-exported
INFINITO_DISTRO per round but the cached INFINITO_CONTAINER stayed at
the initial-default infinito_nexus_debian, so _purge_app_entities()
between rounds tried to docker exec into a container from the wrong
distro and failed with "No such container".
Move the INFINITO_CONTAINER derivation OUTSIDE the load-once guard so
every re-source picks up a CONTAINER name in lock-step with the current
INFINITO_DISTRO. ci/all.sh now re-sources defaults.sh after each
export INFINITO_DISTRO=\$distro to trigger that re-derivation. defaults.sh
stays the single spot that owns the formula.
2. Retire the --distro CLI arg from cli.deploy.development {up,down,stop,
restart,init,deploy,exec,logs,build}. The arg duplicated INFINITO_DISTRO
(its default already read from the env), creating a hidden second source
of truth that drifted from the env across matrix iterations. Replace it
with cli.deploy.development.common.resolve_distro() which reads
INFINITO_DISTRO strictly (raises SystemExit on unset/invalid), and
simplify make_compose() to take no args. All bash callers
(scripts/tests/deploy/{ci,local}/**, Makefile restart target) drop the
redundant --distro \"\${INFINITO_DISTRO}\" pass-through.
Verified: make test passes (1553 unit + 168 integration). The mechanism of
the WP fix is verified by a synthetic distro-cycling test of defaults.sh
re-derivation; the original CI multi-distro repro can only be confirmed
end-to-end by the next CI push (local single-distro deploys do not exercise
the stale-env path).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
64 lines
1.9 KiB
Python
64 lines
1.9 KiB
Python
from __future__ import annotations
|
|
|
|
import argparse
|
|
import os
|
|
|
|
from .common import make_compose
|
|
|
|
|
|
def add_parser(sub: argparse._SubParsersAction) -> None:
|
|
p = sub.add_parser("exec", help="Execute a command inside the infinito container.")
|
|
p.add_argument(
|
|
"--env",
|
|
action="append",
|
|
default=[],
|
|
metavar="KEY=VALUE",
|
|
help=(
|
|
"Inject KEY=VALUE into the container environment for this "
|
|
"exec call. Repeatable. Lets bash callers pass per-run "
|
|
"context (INVENTORY_FILE, APPS, ...) into in-container "
|
|
"helper scripts without inlining heredocs."
|
|
),
|
|
)
|
|
p.add_argument(
|
|
"cmd",
|
|
nargs=argparse.REMAINDER,
|
|
help="Command to execute (use `--` to separate).",
|
|
)
|
|
p.set_defaults(_handler=handler)
|
|
|
|
|
|
def _parse_env_pairs(pairs: list[str]) -> dict[str, str]:
|
|
parsed: dict[str, str] = {}
|
|
for pair in pairs:
|
|
if "=" not in pair:
|
|
raise SystemExit(f"--env expects KEY=VALUE; got {pair!r} without '='")
|
|
key, value = pair.split("=", 1)
|
|
key = key.strip()
|
|
if not key:
|
|
raise SystemExit(f"--env KEY is empty in {pair!r}")
|
|
parsed[key] = value
|
|
return parsed
|
|
|
|
|
|
def handler(args: argparse.Namespace) -> int:
|
|
compose = make_compose()
|
|
|
|
cmd = list(args.cmd or [])
|
|
if cmd and cmd[0] == "--":
|
|
cmd = cmd[1:]
|
|
if not cmd:
|
|
raise SystemExit("exec requires a command (e.g. exec -- sh -lc 'whoami')")
|
|
|
|
extra_env: dict[str, str] = {}
|
|
services_disabled = os.environ.get("SERVICES_DISABLED", "")
|
|
if services_disabled:
|
|
extra_env["SERVICES_DISABLED"] = services_disabled
|
|
|
|
# Caller-supplied --env entries win over implicit ones (current convention
|
|
# in the dev CLI: explicit user input overrides implicit defaults).
|
|
extra_env.update(_parse_env_pairs(args.env or []))
|
|
|
|
r = compose.exec(cmd, check=False, extra_env=extra_env or None)
|
|
return int(r.returncode)
|