fix(compose): include shared base and core compose files #251

Merged

pdurlej merged 1 commit from codex/cutover/compose-include-directive into main

2026-05-13 06:47:37 +02:00

codex commented

2026-05-12 22:30:07 +02:00

Collaborator

Canary status: missing — fire canary 3+3 manually before merge

Canary Context Pack

Product story

The RS2000 cutover needs compose/apps/compose.yaml to be self-resolving when platformctl apply invokes it from the canonical repo checkout. Without shared compose primitives in scope, the first real apply fails before mutation.

What changed

Added a top-level Compose include: block to compose/apps/compose.yaml for:

../base/compose.yaml — shared networks and named volumes
../core/compose.yaml — shared backing services referenced by apps through depends_on

Why it changed

This refines Pan Herbatka's Recovery Plan Call 1 after empirical pre-flight evidence in #142 comment 4903. base alone fixed the internal network gap but exposed app dependencies on core services such as postgres; base + core resolves the compose model.

Files touched

compose/apps/compose.yaml

Relevant context

PR #250 recovery plan
Issue #142 comment 4903 pre-flight checkpoint
compose/base/compose.yaml
compose/core/compose.yaml

Runtime evidence

No runtime mutation was performed.

Local evidence:

baseline apps-only with dummy env:
service "karakeep-meilisearch" refers to undefined network internal: invalid compose project

simulated include base apps:
service "forgejo" depends on undefined service "postgres": invalid compose project

simulated include base core apps:
rc=0

After this patch:

docker compose -f compose/apps/compose.yaml config --quiet
rc=1, required variable HONCHO_REDIS_PASSWORD is missing

docker compose --env-file <dummy-all-vars> -f compose/apps/compose.yaml config --quiet
rc=0

Known constraints

The production env-file is still not wired. The no-env command is expected to fail on required secret variables until Phase 3 adds runner-local --env-file support.

Explicit out-of-scope

No platformctl apply changes.
No runner/env-file changes.
No Infisical Token Auth retry.
No workflow dispatch.
No production mutation.

Requested decision

Merge after review if the compose include boundary is acceptable.

Merge blockers

Any remaining structural compose error with dummy env values.
Any evidence that including core from apps changes runtime service behavior rather than only making dependencies visible to Compose.

Spec sources read

state/codex-prep/RECOVERY-PLAN-CUTOVER-2026-05-12-evening.md — execution runbook
state/codex-prep/rs2000-closeout-handover-2026-05-12.md — runtime baseline and stop conditions
compose/apps/compose.yaml — target file and env interpolation patterns
compose/base/compose.yaml — shared networks and volumes
compose/core/compose.yaml — backing services required by apps dependencies
control-plane/platformctl/apply.py — confirm current single-file apply behavior
docs/ci/runner-contract.md — deploy runner constraints
docs/forgejo-agent-operations.md — Forgejo identity and API write rules

Refs #142

Canary status: missing — fire canary 3+3 manually before merge ## Canary Context Pack ### Product story The RS2000 cutover needs `compose/apps/compose.yaml` to be self-resolving when `platformctl apply` invokes it from the canonical repo checkout. Without shared compose primitives in scope, the first real apply fails before mutation. ### What changed Added a top-level Compose `include:` block to `compose/apps/compose.yaml` for: - `../base/compose.yaml` — shared networks and named volumes - `../core/compose.yaml` — shared backing services referenced by apps through `depends_on` ### Why it changed This refines Pan Herbatka's Recovery Plan Call 1 after empirical pre-flight evidence in #142 comment 4903. `base` alone fixed the `internal` network gap but exposed app dependencies on core services such as `postgres`; `base + core` resolves the compose model. ### Files touched - `compose/apps/compose.yaml` ### Relevant context - PR #250 recovery plan - Issue #142 comment 4903 pre-flight checkpoint - `compose/base/compose.yaml` - `compose/core/compose.yaml` ### Runtime evidence No runtime mutation was performed. Local evidence: ```text baseline apps-only with dummy env: service "karakeep-meilisearch" refers to undefined network internal: invalid compose project simulated include base apps: service "forgejo" depends on undefined service "postgres": invalid compose project simulated include base core apps: rc=0 ``` After this patch: ```text docker compose -f compose/apps/compose.yaml config --quiet rc=1, required variable HONCHO_REDIS_PASSWORD is missing docker compose --env-file <dummy-all-vars> -f compose/apps/compose.yaml config --quiet rc=0 ``` ### Known constraints The production env-file is still not wired. The no-env command is expected to fail on required secret variables until Phase 3 adds runner-local `--env-file` support. ### Explicit out-of-scope - No `platformctl apply` changes. - No runner/env-file changes. - No Infisical Token Auth retry. - No workflow dispatch. - No production mutation. ### Requested decision Merge after review if the compose include boundary is acceptable. ### Merge blockers - Any remaining structural compose error with dummy env values. - Any evidence that including `core` from `apps` changes runtime service behavior rather than only making dependencies visible to Compose. ## Spec sources read - `state/codex-prep/RECOVERY-PLAN-CUTOVER-2026-05-12-evening.md` — execution runbook - `state/codex-prep/rs2000-closeout-handover-2026-05-12.md` — runtime baseline and stop conditions - `compose/apps/compose.yaml` — target file and env interpolation patterns - `compose/base/compose.yaml` — shared networks and volumes - `compose/core/compose.yaml` — backing services required by apps dependencies - `control-plane/platformctl/apply.py` — confirm current single-file apply behavior - `docs/ci/runner-contract.md` — deploy runner constraints - `docs/forgejo-agent-operations.md` — Forgejo identity and API write rules Refs #142

codex added 1 commit

2026-05-12 22:30:07 +02:00

fix(compose): include shared base and core compose files

canary-required / collect-diff (pull_request) Failing after 4s

Details

platformctl plan / auto-apply scope (pull_request) Successful in 18s

Details

canary-required / canary (pull_request) Has been skipped

Details

base-is-main / guard (pull_request) Successful in 1s

Details

f06f2a9339