Skip to content

deps: migrate docker/docker to moby/moby/client and moby/moby/api#27870

Open
pkazmierczak wants to merge 25 commits intomainfrom
f-migrate-docker-docker-to-moby-moby
Open

deps: migrate docker/docker to moby/moby/client and moby/moby/api#27870
pkazmierczak wants to merge 25 commits intomainfrom
f-migrate-docker-docker-to-moby-moby

Conversation

@pkazmierczak
Copy link
Copy Markdown
Contributor

@pkazmierczak pkazmierczak commented Apr 23, 2026

Since v29, docker doesn’t publish its Go packages under github.com/docker/docker anymore. See: Release v29.0.0 · moby/moby

Go packages are now split into moby/moby/api and moby/moby/client, which this changeset migrates to.

note to reviewers: 99% of this huge PR is just adapting to the new APIs (which are frankly much better). The only tricky part is that we used to rely on two internal-to-docker libraries: resolvconf and registry. I vendored resolvconf code under lib/resolvconf. registry package we only used for one or two methods and those were easy to replicate inline (see ‎drivers/docker/utils.go).

Internal ref: https://hashicorp.atlassian.net/browse/NMD-1404

@pkazmierczak pkazmierczak force-pushed the f-migrate-docker-docker-to-moby-moby branch from 05dae15 to 2f4842f Compare April 23, 2026 13:42
@pkazmierczak pkazmierczak self-assigned this Apr 23, 2026
@pkazmierczak pkazmierczak added theme/driver/docker dependencies Pull requests that update a dependency file backport/ent/1.10.x+ent backport to 1.10.x+ent release line backport/ent/1.11.x+ent backport to 1.11.x+ent release line backport/2.0.x backport to 2.0.x release line labels Apr 23, 2026
@pkazmierczak pkazmierczak marked this pull request as ready for review April 23, 2026 14:38
@pkazmierczak pkazmierczak requested review from a team as code owners April 23, 2026 14:38
Comment thread helper/resolvconf/resolvconf.go Outdated
Comment on lines +1 to +2
// Copyright IBM Corp. 2015, 2025
// SPDX-License-Identifier: MPL-2.0
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Oof, this has been vendored from https://github.com/moby/moby/blob/v28.5.2/libnetwork/resolvconf/resolvconf.go, right? I'm like 99% sure this should indicate that it's been vendored from there and we should retain the upstream copyright notice, rather than adding IBMs.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I actually haven't copied it, but in all honesty I'd rather have? So I'm gonna do the ns_linux thing instead.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

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

Labels

backport/ent/1.10.x+ent backport to 1.10.x+ent release line backport/ent/1.11.x+ent backport to 1.11.x+ent release line backport/2.0.x backport to 2.0.x release line dependencies Pull requests that update a dependency file theme/driver/docker

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants