Skip to content

chore(cli): keep service Dockerfile image lines apart to avoid catalog PR conflicts - #6992

Merged
jgoux merged 1 commit into
developfrom
chore/separate-dockerfile-image-lines
Oct 5, 2026
Merged

jgoux merged 1 commit into
developfrom
chore/separate-dockerfile-image-lines

Conversation

@jgoux

@jgoux jgoux commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

Every generated FROM line in the service Dockerfiles sat next to another, so two catalog PRs for neighbouring aliases (pg and pg15, realtime and storage, …) always conflicted once the first one merged. A blank line between image lines lets git merge them independently, and the header says why.

@jgoux
jgoux requested review from a team and supabase-oss as code owners October 5, 2026 10:12
@jgoux jgoux self-assigned this Oct 5, 2026

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Review

Both independent reviews completed. The Dockerfile copies remain byte-identical, and their consumers tolerate blank lines. Claude's spacing-enforcement nit is confirmed; its suggestion that separators must be blank is unsupported because existing comment lines also prevent adjacency. No functional defects or additional findings were found.

Findings

Severity Location Category Sources Claim
⚪ NIT apps/cli/src/shared/services/Dockerfile:6 maintainability claude The separator-line convention is documented but not enforced. Removing separators from both Dockerfile copies could restore adjacent image lines without failing the generator or existing tests.

Stats

Claude findings: 1 · Codex findings: 0 · Confirmed: 1 · Refuted: 0 · Uncertain: 0


Models: claude-opus-5-5 + gpt-6.1-sol · Trigger: auto · Workflow run

This review runs once per PR. A maintainer can request another with a /ai-review comment.

Comment thread apps/cli/src/shared/services/Dockerfile
@jgoux
jgoux force-pushed the chore/separate-dockerfile-image-lines branch from ef72ad6 to 3ccc599 Compare October 5, 2026 10:31
@jgoux
jgoux enabled auto-merge October 5, 2026 10:32
@jgoux
jgoux added this pull request to the merge queue Oct 5, 2026
Merged via the queue into develop with commit c211d88 Oct 5, 2026
32 checks passed
@jgoux
jgoux deleted the chore/separate-dockerfile-image-lines branch October 5, 2026 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants