Skip to content

fix: avoid pulling build-only compose images#12095

Merged
f2c-ci-robot[bot] merged 1 commit intodev-v2from
fix/compose-image-json-filter
Mar 6, 2026
Merged

fix: avoid pulling build-only compose images#12095
f2c-ci-robot[bot] merged 1 commit intodev-v2from
fix/compose-image-json-filter

Conversation

@ssongliu
Copy link
Member

@ssongliu ssongliu commented Mar 6, 2026

Refs #12092

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Mar 6, 2026

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.

Details

Instructions 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.

@sonarqubecloud
Copy link

sonarqubecloud bot commented Mar 6, 2026

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

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

💡 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")

Choose a reason for hiding this comment

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

P1 Badge 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 👍 / 👎.

Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud left a comment

Choose a reason for hiding this comment

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

/lgtm

@wanghe-fit2cloud
Copy link
Member

/approve

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Mar 6, 2026

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved label Mar 6, 2026
@f2c-ci-robot f2c-ci-robot bot merged commit 75da72c into dev-v2 Mar 6, 2026
6 checks passed
@f2c-ci-robot f2c-ci-robot bot deleted the fix/compose-image-json-filter branch March 6, 2026 02:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants