Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vendor: github.com/moby/buildkit 6bd81372ad6f (master) #2198

Merged
merged 9 commits into from
Jan 26, 2024

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jan 17, 2024

vendor: github.com/containerd/containerd v1.7.12

full diff: containerd/containerd@v1.7.11...v1.7.12

vendor: github.com/google/go-cmp v0.6.0

full diff: google/go-cmp@v0.5.9...v0.6.0

vendor: github.com/google/uuid v1.5.0

full diff: google/uuid@v1.3.1...v1.5.0

vendor: golang.org/x/sys v0.16.0

full diff: golang/sys@v0.15.0...v0.16.0

vendor: golang.org/x/tools v0.14.0, golang.org/x/mod v0.13.0, golang.org/x/sync v0.4.0

full diff:

vendor: github.com/moby/sys/mountinfo v0.7.1

full diff: moby/sys@mountinfo/v0.6.2...mountinfo/v0.7.1

vendor: github.com/docker/docker v25.0.1

  • pkg/system: return even richer xattr errors

full diff: moby/moby@v25.0.0-rc.1...v25.0.1

vendor: github.com/docker/cli v25.0.1

  • cli-plugins: move socket code into common package
  • cli-plugins: don't use abstract sockets on macOS
    • fixes CLI leaving behind plugin socket mount-points
  • socket: return from loop after EOF

full diff: docker/cli@v25.0.0-rc.1...v25.0.1

vendor: github.com/moby/buildkit 6bd81372ad6f (master)

  • tests: implement NetNSDetached method

full diff: moby/buildkit@6e200af...6bd8137

go.mod Outdated Show resolved Hide resolved
@thaJeztah thaJeztah self-assigned this Jan 17, 2024
@thaJeztah thaJeztah requested a review from laurazard January 17, 2024 23:49
@thaJeztah thaJeztah changed the title vendor: github.com/moby/buildkit 0e1e36ba9eb8 (master) vendor: github.com/moby/buildkit a474507b00b0 (master) Jan 18, 2024
@thaJeztah thaJeztah changed the title vendor: github.com/moby/buildkit a474507b00b0 (master) vendor: github.com/moby/buildkit 3eb5163b5d5d (master) Jan 20, 2024
@thaJeztah thaJeztah requested a review from tonistiigi January 20, 2024 01:30
@thaJeztah
Copy link
Member Author

Thanks @crazy-max ! I thought I'd update to latest (with the "non-rc" version of docker), but didn't check for other changes; do you want me to squash your commit with the buildkit-bump commit?

@crazy-max
Copy link
Member

Thanks @crazy-max ! I thought I'd update to latest (with the "non-rc" version of docker), but didn't check for other changes; do you want me to squash your commit with the buildkit-bump commit?

Yes please do

@thaJeztah thaJeztah changed the title vendor: github.com/moby/buildkit 3eb5163b5d5d (master) vendor: github.com/moby/buildkit 5092e0fb3bc8 (master) Jan 26, 2024
@thaJeztah
Copy link
Member Author

@crazy-max rebased, squashed your commit (added you as co-author) and updated to current master, which added moby/buildkit#4587

go.mod Outdated
Comment on lines 16 to 18
github.com/docker/cli v25.0.0+incompatible
github.com/docker/cli-docs-tool v0.6.0
github.com/docker/docker v25.0.0-rc.1+incompatible
github.com/docker/docker v25.0.0+incompatible
Copy link
Member

Choose a reason for hiding this comment

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

Do we want 25.0.1 bump on buildkit first and revendor here?

Copy link
Member Author

Choose a reason for hiding this comment

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

I just opened a PR; moby/buildkit#4591 😅

I also noticed that docker/cli is using cobra v1.8 (but can do that as a follow-up)

Copy link
Member

Choose a reason for hiding this comment

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

Nice thx!

thaJeztah and others added 9 commits January 26, 2024 12:54
- pkg/system: return even richer xattr errors

full diff: moby/moby@v25.0.0-rc.1...v25.0.1

Signed-off-by: Sebastiaan van Stijn <[email protected]>
- cli-plugins: move socket code into common package
- cli-plugins: don't use abstract sockets on macOS
    - fixes CLI leaving behind plugin socket mount-points
- socket: return from loop after EOF

full diff: docker/cli@v25.0.0-rc.1...v25.0.1

Signed-off-by: Sebastiaan van Stijn <[email protected]>
- tests: implement NetNSDetached method

full diff: moby/buildkit@6e200af...6bd8137

Co-authored-by: CrazyMax <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah changed the title vendor: github.com/moby/buildkit 5092e0fb3bc8 (master) vendor: github.com/moby/buildkit 6bd81372ad6f (master) Jan 26, 2024
@thaJeztah
Copy link
Member Author

Updated to latest, and update to v25.0.1 (cli and engine); PTAL ❤️

@crazy-max crazy-max merged commit d0c4bed into docker:master Jan 26, 2024
63 checks passed
@thaJeztah thaJeztah deleted the bump_buildkit branch January 26, 2024 14:22
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