Skip to content

Commit 0843200

Browse files
committed
[iris] Copy repo-root config/ into the image for rigging's force-include
marin-rigging's wheel force-includes the repo-root config/ cluster YAMLs as rigging/clusters so an installed package can resolve config/marin.yaml. The iris controller image builds marin-rigging editable from source, but the deps stage never copied config/ into the build context, so the editable build failed with "Forced include not found: /app/config" and broke the CoreWeave/GCP smoke builds. Copy repo-root config/ into the deps stage (mirrors the existing lib/finelog/config/ copy) and re-include it in the Dockerfile.dockerignore allowlist so it survives context transfer.
1 parent e81bb3b commit 0843200

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

lib/iris/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,12 @@ COPY lib/zephyr/pyproject.toml ./lib/zephyr/pyproject.toml
9696
RUN --mount=type=cache,target=/root/.cache/uv \
9797
uv sync --frozen --package marin-iris --no-install-workspace
9898

99-
# Now copy full source for rigging, finelog, and iris, then install. finelog's
100-
# wheel build force-includes its config/ dir, so copy that too (the editable
101-
# build reads it).
99+
# Now copy full source for rigging, finelog, and iris, then install. rigging's
100+
# wheel force-includes the repo-root config/ cluster YAMLs (-> rigging/clusters)
101+
# and finelog's force-includes lib/finelog/config/, so copy both: the editable
102+
# builds read them.
102103
COPY lib/rigging/src/ ./lib/rigging/src/
104+
COPY config/ ./config/
103105
COPY lib/finelog/src/ ./lib/finelog/src/
104106
COPY lib/finelog/config/ ./lib/finelog/config/
105107
COPY lib/iris/src/ ./lib/iris/src/

lib/iris/Dockerfile.dockerignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636

3737
!lib/rigging/
3838

39+
# Repo-root cluster YAMLs. marin-rigging's wheel force-includes config/ as
40+
# rigging/clusters, so its editable build in the deps stage needs them present.
41+
!config/
42+
3943
# marin-finelog (pure-Python client) builds editable from source; the deps stage
4044
# copies its pyproject + the src/ and config/ inputs its wheel build needs.
4145
!lib/finelog/pyproject.toml

0 commit comments

Comments
 (0)