Skip to content

Conversation

@crazy-max
Copy link
Member

closes #22858

Description

#22858 has not been merged and got conflicts so open this PR to fix it and update buildx ref to 0.25.0 and buildkit ref to 0.23.2 as well.

Also fixes the go.mod that should not contain unrelated indirect dependencies. Bisected from a276911#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6. cc @ArthurFlag

Reviews

  • Technical review
  • Editorial review
  • Product review

@netlify
Copy link

netlify bot commented Jul 10, 2025

Deploy Preview for docsdocker ready!

Name Link
🔨 Latest commit 13b71f3
🔍 Latest deploy log https://app.netlify.com/projects/docsdocker/deploys/686fb5e49dc7a20008f99ce2
😎 Deploy Preview https://deploy-preview-23057--docsdocker.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@github-actions github-actions bot added area/build Relates to Dockerfiles or docker build command dependencies Vendoring, packaging updates labels Jul 10, 2025
@crazy-max crazy-max force-pushed the update-buildx-buildkit branch from 114093d to 13b71f3 Compare July 10, 2025 12:45
@crazy-max
Copy link
Member Author

crazy-max commented Jul 10, 2025

@aevesdocker Btw why docker/cli is not aligned with moby/moby in vendoring?:

module github.com/docker/docs

go 1.24.0

require (
	github.com/docker/buildx v0.25.0 // indirect
	github.com/docker/cli v28.3.1+incompatible // indirect
	github.com/docker/compose/v2 v2.38.2 // indirect
	github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2 // indirect
	github.com/docker/scout-cli v1.15.0 // indirect
	github.com/moby/buildkit v0.23.2 // indirect
	github.com/moby/moby v28.3.2+incompatible // indirect
)

replace (
	github.com/docker/buildx => github.com/docker/buildx v0.25.0
	github.com/docker/cli => github.com/docker/cli v28.3.0+incompatible
	github.com/docker/compose/v2 => github.com/docker/compose/v2 v2.38.2
	github.com/docker/model-cli => github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2
	github.com/docker/scout-cli => github.com/docker/scout-cli v1.15.0
	github.com/moby/buildkit => github.com/moby/buildkit v0.23.2
	github.com/moby/moby => github.com/moby/moby v28.3.2+incompatible
)

We have github.com/docker/cli v28.3.0+incompatible and github.com/moby/moby v28.3.2+incompatible in replace block. Both should match the same version imo. cc @thaJeztah @vvoland

@crazy-max crazy-max merged commit 38b01b6 into docker:main Jul 10, 2025
15 checks passed
@crazy-max crazy-max deleted the update-buildx-buildkit branch July 10, 2025 12:48
@aevesdocker
Copy link
Contributor

@crazy-max I'm unsure, I was resolving the vendoring for the compose release, which didn't include the new --network flag for the docker compose config command and it included that. Was going to resolve with a vendoring of the CLI and moby but I see you've beaten me to it

@crazy-max
Copy link
Member Author

@crazy-max I'm unsure, I was resolving the vendoring for the compose release, which didn't include the new --network flag for the docker compose config command and it included that. Was going to resolve with a vendoring of the CLI and moby but I see you've beaten me to it

Ok I was thinking moby/moby and docker/cli were updated at the same time but looks like not looking at #23042. @vvoland Maybe we should do both at the same time in the future?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/build Relates to Dockerfiles or docker build command dependencies Vendoring, packaging updates

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants