Skip to content

Revert "vendor: docker, docker/cli v28.0.0-rc.1" - #5718

Merged
tonistiigi merged 2 commits into
moby:masterfrom
crazy-max:revert-docker-28
Feb 11, 2025
Merged

tonistiigi merged 2 commits into
moby:masterfrom
crazy-max:revert-docker-28

Conversation

@crazy-max

@crazy-max crazy-max commented Feb 11, 2025

Copy link
Copy Markdown
Member

reverts #5602 (only docker 28.0.0-rc.1, we keep XFT deps)

Forgot that we need a stable moby release before releasing 🙈

This reverts commit 5462f3d.

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This reverts commit 13b030b.

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max crazy-max changed the title Revert docker 28 Revert "vendor: docker, docker/cli v28.0.0-rc.1" Feb 11, 2025
@github-actions github-actions Bot added the area/dependencies Pull requests that update a dependency file label Feb 11, 2025
@crazy-max
crazy-max requested a review from tonistiigi February 11, 2025 17:32
@crazy-max crazy-max added this to the v0.20.0 milestone Feb 11, 2025
@crazy-max
crazy-max marked this pull request as ready for review February 11, 2025 17:45
@thaJeztah

Copy link
Copy Markdown
Member

Why the revert?

@tonistiigi

Copy link
Copy Markdown
Member

Revert is because there will not be a Moby GA release before BuildKit GA. We can bring this back to master after the release branch has been cut.

This is specific to moby & cli. For any XFT dependencies, we can update if needed.

@tonistiigi
tonistiigi merged commit 850c077 into moby:master Feb 11, 2025
@crazy-max
crazy-max deleted the revert-docker-28 branch February 11, 2025 19:34
@vvoland

vvoland commented Feb 12, 2025

Copy link
Copy Markdown
Collaborator

Revert is because there will not be a Moby GA release before BuildKit GA.

What are the technical reasons for needing a tagged GA release?

RCs are as close to GA as you can get. All changes that could potentially be breaking are already there. The only reason for vendoring RCs is to get around the circular dependency issue.

Ideally, the git reference for the GA and last RC should be the same - that's what we do with vendoring moby in docker/cli:

@crazy-max

Copy link
Copy Markdown
Member Author

The only reason for vendoring RCs is to get around the circular dependency issue.

We were consistent with past BuildKit releases vendoring latest Moby stable:

And don't recall we got issues with dependencies as we align them across projects before cutting a release.

RCs are as close to GA as you can get.

If that's the case I think that's fine but doesn't look like it for some of them:

@vvoland

vvoland commented Feb 12, 2025

Copy link
Copy Markdown
Collaborator

There are breaking changes in v28 client interface, which AFAIK will make it unable for the compose to vendor buildx 0.21.

@thaJeztah

thaJeztah commented Feb 12, 2025

Copy link
Copy Markdown
Member

If that's the case I think that's fine but doesn't look like it for some of them:

For the larger diffs in those, you know those were because we had to update dependencies to get to the latest BuildKit?

And I think for all of those, there had been long-lived draft PRs to verify status long before merged. Whereas the reverse usually is not the case.

@crazy-max

Copy link
Copy Markdown
Member Author

There are breaking changes in v28 client interface, which AFAIK will make it unable for the compose to vendor buildx 0.21.

Oh compose requires docker 28? Then yes that would mean we need docker 28 vendored in Buildx.

@tonistiigi

Copy link
Copy Markdown
Member

There are breaking changes in v28 client interface, which AFAIK will make it unable for the compose to vendor buildx 0.21.

What's the breakage? If there is one, we can already bring in v28 to buildx now. Just need to cut the release branch from current release.

The actual solution for this is to get the PRs calling buildx directly merged in compose so it doesn't need imports.

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

Labels

area/dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants