mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 03:38:23 +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>
68 lines
1.7 KiB
Python
68 lines
1.7 KiB
Python
from __future__ import annotations
|
|
|
|
import argparse
|
|
import os
|
|
|
|
from .build import handler as build_handler
|
|
from .common import make_compose
|
|
|
|
|
|
def add_parser(sub: argparse._SubParsersAction) -> None:
|
|
p = sub.add_parser("up", help="Start compose stack (coredns + infinito).")
|
|
p.add_argument(
|
|
"--skip-entry-init",
|
|
action="store_true",
|
|
help="Do not run /opt/src/infinito/scripts/docker/entry.sh true after stack is up.",
|
|
)
|
|
p.add_argument(
|
|
"--when-down",
|
|
action="store_true",
|
|
help="Only start stack if it is not already running.",
|
|
)
|
|
p.set_defaults(_handler=handler)
|
|
|
|
|
|
def _maybe_build_missing() -> int:
|
|
# CI: never build (image is pulled). Local: build if missing.
|
|
if os.environ.get("INFINITO_NO_BUILD", "0") == "1":
|
|
return 0
|
|
|
|
build_args = argparse.Namespace(
|
|
missing=True,
|
|
no_cache=False,
|
|
target="",
|
|
tag="",
|
|
push=False,
|
|
publish=False,
|
|
registry="",
|
|
owner="",
|
|
repo_prefix="",
|
|
version="",
|
|
stable="",
|
|
)
|
|
|
|
return int(build_handler(build_args))
|
|
|
|
|
|
def _stack_is_running() -> bool:
|
|
compose = make_compose()
|
|
r = compose.run(["ps", "-q", "infinito"], check=False, capture=True)
|
|
cid = (r.stdout or "").strip()
|
|
return bool(cid)
|
|
|
|
|
|
def handler(args: argparse.Namespace) -> int:
|
|
# when-down: skip if already running
|
|
if args.when_down:
|
|
if _stack_is_running():
|
|
print(">>> Stack already running — skipping up")
|
|
return 0
|
|
|
|
rc = _maybe_build_missing()
|
|
if rc != 0:
|
|
return rc
|
|
|
|
compose = make_compose()
|
|
compose.up(run_entry_init=not bool(args.skip_entry_init))
|
|
return 0
|