fix: avoid pulling build-only compose images#12095
Conversation
|
Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ee56f2187e
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| base, extra := getComposeBaseCmd() | ||
| args := append(extra, strings.Fields(loadFiles(filePath))...) | ||
| args = append(args, "config", "--images") | ||
| args = append(args, "config", "--format", "json", "--no-normalize") |
There was a problem hiding this comment.
Preserve docker-compose compatibility when reading images
GetDockerComposeCommand still falls back to the legacy docker-compose binary when the v2 plugin is unavailable (agent/utils/common/common.go:414-420), but this call now unconditionally uses config --format json --no-normalize. On hosts with legacy/older Compose CLIs, these flags are not supported, so getComposeImagesByCommand will always fail and force the weaker YAML fallback path, which is known to lose behavior (for example, it cannot read comma-separated compose paths because it does os.ReadFile(filePath) directly). This can break image pre-pull during compose up for existing supported deployments.
Useful? React with 👍 / 👎.
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: wanghe-fit2cloud The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |



Refs #12092