0 Fork 0

mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2026-11-08 11:46:35 +00:00

Files

T

kevinveenbirkenbachandClaude Opus 4.7 8e293bd921 fix(compose-deploy): stop persisting runtime routing knobs into .env

Root cause of step-08 deploy failures across all 4 test-development
distros in run 26572559126: `make compose-deploy mode=reinstall
apps=web-app-dashboard INFINITO_SERVICES_DISABLED=matomo` (step 07)
made make export the cmdline var into the recipe's shell env, which
reached `runner.py` → `make setup` → `make dotenv`. The dotenv
generator's `setdefault` then baked the runtime-only value into the
on-disk `.env`. Step 08 sourced that .env, filtered `web-app-matomo`
out of its primary apps, and exited with "All primary apps disabled".

Fix:

- Drop the 7 routing knobs (apps, mode, purge, bundles, disable,
  full_cycle, variant) from `passthrough.STATIC_KEYS` and from
  `default.env`. They are per-invocation; .env is the persistent SPOT
  and must not capture them.
- Switch every consumer from `os.environ["KEY"]` strict access to
  `os.environ.get("KEY", "")` so the missing-key path stops at "no
  filter" instead of a KeyError.
- Rename the env-var surface to match the make-alias surface 1:1
  (lowercase): INFINITO_APPS → apps, INFINITO_SERVICES_DISABLED →
  disable, INFINITO_BUNDLES → bundles, INFINITO_FULL_CYCLE →
  full_cycle, INFINITO_VARIANT → variant, INFINITO_DEPLOY_MODE → mode,
  INFINITO_PURGE_ENTITIES → purge. The make alias was the user-facing
  name in every doc; routing-knob env vars now use the same name so
  the cmdline form, the recipe env-prefix, and the consumer reads
  all line up.
- Collapse the Makefile `compose-deploy` recipe to just the two
  knobs whose alias differs from the env name (`type` →
  INFINITO_DEPLOY_TYPE, `debug` → INFINITO_DEBUG). GNU Make
  auto-exports cmdline variables into the recipe's shell env, so the
  identical-name `$(if $(apps),apps="$(apps)")` lines were pure
  noise.
- Drop `disable: ${disable}` from compose.yml. The dev CLI builds
  `extra_env` per `docker exec` call and forwards `disable` via
  `-e`, so the container env never needs the value frozen at
  compose-up time.
- Update the 3 actual leak call sites
  (07/08/09_deploy_*.sh) to the make-alias form
  (`disable=matomo`, `full_cycle=true`, `variant=1`).
- Add `SIM112` to ruff's ignore set: the lowercase env names are
  the deliberate make/env parity, not a typo.

Repro before fix: `INFINITO_SERVICES_DISABLED=matomo make dotenv`
wrote `INFINITO_SERVICES_DISABLED=matomo` to `.env`. After fix:
`disable=matomo make dotenv` leaves `.env` untouched.

Tests: `make test` and `make autoformat` green (2711 tests, 8 lint
sub-targets).

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

2026-05-28 17:47:03 +02:00

apps

fix(compose-deploy): stop persisting runtime routing knobs into .env

2026-05-28 17:47:03 +02:00

bundles

fix(compose-deploy): stop persisting runtime routing knobs into .env

2026-05-28 17:47:03 +02:00

container

fix(compose-deploy): stop persisting runtime routing knobs into .env

2026-05-28 17:47:03 +02:00

main.sh

fix(compose-deploy): stop persisting runtime routing knobs into .env

2026-05-28 17:47:03 +02:00

README.md

fix(compose-deploy): stop persisting runtime routing knobs into .env

2026-05-28 17:47:03 +02:00

README.md

Local Deploy Scripts

This directory holds the executable local deploy flows under scripts/tests/deploy/local/deploy/.

For other local helpers, use ../README.md. For the canonical Make target index that invokes these helpers, see make.md.

Prerequisites

Run commands from the repository root.
Docker and Docker Compose are available locally.
jq is installed for the app-discovery step in apps/initialize/all.sh.
If you run scripts directly, load the defaults with source scripts/meta/env/all.sh.

Naming

The apps/ subtree is split by verb (the user intent) and scope:

initialize/ creates or refreshes the inventory; existing entity state is kept.
reinstall/ recreates the inventory and purges existing entities first.
update/ reuses the already-initialized inventory.
all.sh covers every discovered application; selection.sh covers one or more apps passed via apps (or a positional argument).

The bundles/ subtree mirrors the same axes for inventory bundles (fresh.sh ≈ initialize, update.sh ≈ update).

The container/ subtree holds the in-container halves invoked by the host wrappers and follows the same verb/scope layout; see container/.

Entry Points

Entry point	What it does	Key inputs	Notes
`apps/initialize/all.sh`	Discovers apps, creates `devices.yml`, and deploys all discovered apps.	`INFINITO_DISTRO`, `INFINITO_DEPLOY_TYPE`, `INFINITO_INVENTORY_DIR`	Fresh all-app inventory path.
`apps/initialize/selection.sh <app-id>`	Creates `devices.yml` for one or more apps and deploys them.	`apps=<app-id>`	Init and deploy path for a specific app set.
`apps/reinstall/selection.sh`	Recreates `devices.yml` and deploys one or more apps twice with `ASYNC_ENABLED=false` and `ASYNC_ENABLED=true`.	`INFINITO_DISTRO`, `INFINITO_INVENTORY_DIR`, `INFINITO_DEPLOY_TYPE`, `apps`	Baseline and recovery path; purges entities first.
`apps/update/all.sh`	Deploys every app from an existing inventory.	`INFINITO_DISTRO`, `INFINITO_DEPLOY_TYPE`, `INFINITO_INVENTORY_DIR`	Requires `${INFINITO_INVENTORY_DIR}/devices.yml` and `.password`.
`apps/update/selection.sh`	Runs a targeted `infinito administration deploy dedicated` for one or more apps.	`apps`, `INFINITO_DEPLOY_TYPE`, `INFINITO_CONTAINER`, `INFINITO_DEBUG`, `INFINITO_INVENTORY_DIR`	Reuses `devices.yml`.