api/compat: switch to moby/moby by jankaluza · Pull Request #28057 · containers/podman

jankaluza · 2026-02-10T12:38:56Z

Replace github.com/docker/docker API imports with github.com/moby/moby across compat handlers, swagger models, and tests to align with upstream type definitions.

Checklist

Ensure you have completed the following checklist for your pull request to be reviewed:

Certify you wrote the patch or otherwise have the right to pass it on as an open-source patch by signing all
commits. (git commit -s). (If needed, use git commit -s --amend). The author email must match
the sign-off email address. See CONTRIBUTING.md
for more information.
Referenced issues using Fixes: #00000 in commit message (if applicable)
Tests have been added/updated (or no tests are needed)
Documentation has been updated (or no documentation changes are needed)
All commits pass make validatepr (format/lint checks)
Release note entered in the section below (or None if no user-facing changes)

Does this PR introduce a user-facing change?

None

jankaluza · 2026-02-10T12:40:34Z

@Luap99 , could you please check system.go (https://github.com/containers/podman/pull/28057/changes#diff-2facc6ee4ed6c946594f6ecde156045ee8227e22a06e966273a199f79888c339) and tell me if that's how you expect the support for multiple versions to be done?

packit-as-a-service · 2026-02-10T12:42:09Z

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

packit-as-a-service · 2026-02-10T12:42:10Z

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

Luap99 · 2026-02-10T13:44:11Z

Not a proper review but yeah looks about right logic wise

jankaluza · 2026-02-10T14:16:28Z

Thanks, that's all I needed so far :-).

packit-as-a-service · 2026-02-12T11:04:22Z

tmt tests failed for commit d6a3860. @lsm5, @psss, @thrix please check.

packit-as-a-service · 2026-02-12T11:21:02Z

tmt tests failed for commit c50fa7a. @lsm5, @psss, @thrix please check.

packit-as-a-service · 2026-02-12T11:51:14Z

tmt tests failed for commit cda638a. @lsm5, @psss, @thrix please check.

packit-as-a-service · 2026-02-12T13:02:54Z

tmt tests failed for commit ef67519. @lsm5, @psss, @thrix please check.

pkg/homedir/homedir.go

pkg/specgen/generate/kube/kube.go

packit-as-a-service · 2026-02-13T10:57:14Z

tmt tests failed for commit 001b4f5. @lsm5, @psss, @thrix please check.

packit-as-a-service · 2026-02-13T11:28:47Z

tmt tests failed for commit b6d4436. @lsm5, @psss, @thrix please check.

Luap99 · 2026-02-18T18:08:16Z

If this is ready for review can you drop draft and wip title so others will take a look as well

Luap99

LGTM overall though I have not checked stuff in detail

Luap99 · 2026-02-18T18:09:04Z

pkg/api/handlers/compat/containers.go

+			StopTimeout:     &stopTimeout,
+			Shell:           nil,
+		},
+		MacAddress: "",


this is not needed, by default it will always be the zero value (i.e. empty string)
but sure it does not hurt either

I did that to stay consistent with the rest of the code where we explicitly set an empty string.

pkg/api/handlers/compat/networks.go

Luap99

LGTM

jankaluza · 2026-02-23T10:21:51Z

@Luap99 , I'm thinking if we could merge this one or if I should ask someone for additional review. What do you think?

Luap99 · 2026-02-23T11:01:26Z

well we generally need two reviews unless it is something trivial so yeah...

Honny1

I checked the code, and it seems good to me. (Just two questions.) I'm a little bothered by the structures that start with 'Legacy'. For now, it's okay, but for 6.0 we should throw them away or rename them differently or start deprecation, because the naming implies we're trying to support something old. Also, I have a feeling that we probably missed filling in some new fields in the structures, but tracking that seems pretty hard. I think the best effort approach is to wait until someone files an issue.

Maybe in the future, we should create a smoke test for the compat API to check if it works with Docker, ensuring it functions correctly for at least the basic use cases.

pkg/api/handlers/compat/networks.go

Honny1 · 2026-02-24T16:13:32Z

pkg/api/handlers/compat/images_push.go

+						ID:       report.ID,
+					})
+					if err == nil {
+						report.ProgressMessage = string(b)


The output from report.Progress.String() seems to be different from the marshaled JSON. Won't this break callers?

That's good point. I double-checked the moby/moby code and you are right. I've backported the original String() function to our images_push.go. I think there's no other way around it, because this String() function is not part of public API anymore.

packit-as-a-service · 2026-02-27T11:42:46Z

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

jankaluza · 2026-02-27T11:44:35Z

@Honny1 , yeah. That compat code seems to be all over the place. Ideally we should just take the client versions we support and run the API calls with them to ensure they work with our API and report failures. Or really compare our responses with docker responses as part of tests.

jankaluza · 2026-02-27T11:44:58Z

I've addressed the comments and rebased the PR.

jankaluza · 2026-02-27T12:53:05Z

/packit retest-failed

jankaluza · 2026-03-03T12:13:57Z

/packit retest-failed

jankaluza · 2026-03-03T16:54:11Z

@Honny1 do you think you could find some time to review this one again, please? :-)

Honny1

I found docker/docker and other Docker libs in go.mod. Is this correct?

github.com/docker/distribution v2.8.3+incompatible
github.com/docker/docker v28.5.2+incompatible
github.com/docker/go-connections v0.6.0
github.com/docker/go-plugins-helpers v0.0.0-20240701071450-45e2431495c8
github.com/docker/go-units v0.5.0

pkg/api/handlers/compat/containers_create.go

pkg/api/handlers/types.go

Luap99 · 2026-03-04T14:47:37Z

I found docker/docker and other Docker libs in go.mod. Is this correct?

github.com/docker/distribution v2.8.3+incompatible
github.com/docker/docker v28.5.2+incompatible
github.com/docker/go-connections v0.6.0
github.com/docker/go-plugins-helpers v0.0.0-20240701071450-45e2431495c8
github.com/docker/go-units v0.5.0

#28057 (review)

There is still one package we depend on directly (some indirectly which would take even longer to get rid of), it should not block the API changes for now

Honny1 · 2026-03-05T10:15:21Z

pkg/api/handlers/types.go

+	VirtualSize int64 `json:"VirtualSize,omitempty"`
+}
+
+// Deprecated: kept to maintain backwards compatibility with API < v1.52


The linter is flagging a deprecation notice. I would silence it when these deprecated structures are used.

Honny1

LGTM, once CI passes.

Replace github.com/docker/docker API imports with github.com/moby/moby across compat handlers, swagger models, and tests to align with upstream type definitions. Fixes: containers#27536. Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

The JSONProgress is not part of moby/moby API anymore: moby/moby@f4127d7 To stay compatible with the previous client version, this commit backports the jsonmessage.JSONProgress.String() and uses it to genereate the progress report. Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

jankaluza · 2026-03-09T11:28:52Z

@Honny1 , @Luap99 , I've rebased this PR and fixed the tests. I think we are good to merge.

Honny1

LGTM, on my side.

jankaluza marked this pull request as draft February 10, 2026 12:39

github-actions bot added machine kind/api-change Change to remote API; merits scrutiny labels Feb 10, 2026

jankaluza force-pushed the 27536 branch 5 times, most recently from d6a3860 to c50fa7a Compare February 12, 2026 10:27

jankaluza added the bloat_approved Approve a PR in which binary file size grows by over 50k label Feb 12, 2026

jankaluza force-pushed the 27536 branch from c50fa7a to cda638a Compare February 12, 2026 11:11

jankaluza force-pushed the 27536 branch from cda638a to ef67519 Compare February 12, 2026 12:09

Luap99 reviewed Feb 12, 2026

View reviewed changes

pkg/homedir/homedir.go Outdated Show resolved Hide resolved

pkg/specgen/generate/kube/kube.go Outdated Show resolved Hide resolved

jankaluza force-pushed the 27536 branch 2 times, most recently from 001b4f5 to 43ca938 Compare February 13, 2026 10:27

jankaluza force-pushed the 27536 branch 2 times, most recently from dd2fdb5 to b6d4436 Compare February 13, 2026 11:15

jankaluza force-pushed the 27536 branch 3 times, most recently from 502e398 to 1556b9f Compare February 17, 2026 09:58

Luap99 reviewed Feb 18, 2026

View reviewed changes

jankaluza marked this pull request as ready for review February 19, 2026 09:11

jankaluza force-pushed the 27536 branch from 6904e59 to 0d8b940 Compare February 19, 2026 10:45

Luap99 approved these changes Feb 19, 2026

View reviewed changes

Honny1 reviewed Feb 24, 2026

View reviewed changes

jankaluza force-pushed the 27536 branch from 7a3346f to 6c46401 Compare February 27, 2026 11:41

jankaluza force-pushed the 27536 branch from 6c46401 to 9941f98 Compare March 3, 2026 15:22

Honny1 reviewed Mar 4, 2026

View reviewed changes

pkg/api/handlers/compat/containers_create.go Outdated Show resolved Hide resolved

pkg/api/handlers/types.go Show resolved Hide resolved

Honny1 reviewed Mar 5, 2026

View reviewed changes

Honny1 approved these changes Mar 5, 2026

View reviewed changes

jankaluza force-pushed the 27536 branch from 218e0cf to acaac2a Compare March 9, 2026 09:59

jankaluza changed the title ~~[WIP] api/compat: switch to moby/moby~~ api/compat: switch to moby/moby Mar 9, 2026

jankaluza added 4 commits March 9, 2026 11:09

api/compat: switch to moby/moby

56e555b

Replace github.com/docker/docker API imports with github.com/moby/moby across compat handlers, swagger models, and tests to align with upstream type definitions. Fixes: containers#27536. Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

compat/network: Remove temporary ipvAddress variables.

65585e4

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

Deprecate Legacy structs and use port.String()

01688e7

Signed-off-by: Jan Kaluza <jkaluza@redhat.com>

jankaluza force-pushed the 27536 branch from acaac2a to 01688e7 Compare March 9, 2026 10:09

Honny1 approved these changes Mar 9, 2026

View reviewed changes

Luap99 merged commit 1c3cc92 into containers:main Mar 9, 2026
90 checks passed

Conversation

jankaluza commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Does this PR introduce a user-facing change?

Uh oh!

jankaluza commented Feb 10, 2026

Uh oh!

packit-as-a-service bot commented Feb 10, 2026

Uh oh!

packit-as-a-service bot commented Feb 10, 2026

Uh oh!

Luap99 commented Feb 10, 2026

Uh oh!

jankaluza commented Feb 10, 2026

Uh oh!

packit-as-a-service bot commented Feb 12, 2026

Uh oh!

packit-as-a-service bot commented Feb 12, 2026

Uh oh!

packit-as-a-service bot commented Feb 12, 2026

Uh oh!

packit-as-a-service bot commented Feb 12, 2026

Uh oh!

Uh oh!

Uh oh!

packit-as-a-service bot commented Feb 13, 2026

Uh oh!

packit-as-a-service bot commented Feb 13, 2026

Uh oh!

Luap99 commented Feb 18, 2026

Uh oh!

Luap99 left a comment

Choose a reason for hiding this comment

Uh oh!

Luap99 Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

jankaluza Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Luap99 left a comment

Choose a reason for hiding this comment

Uh oh!

jankaluza commented Feb 23, 2026

Uh oh!

Luap99 commented Feb 23, 2026

Uh oh!

Honny1 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Honny1 Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

jankaluza Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

packit-as-a-service bot commented Feb 27, 2026

Uh oh!

jankaluza commented Feb 27, 2026

Uh oh!

jankaluza commented Feb 27, 2026

Uh oh!

jankaluza commented Feb 27, 2026

Uh oh!

jankaluza commented Mar 3, 2026

Uh oh!

jankaluza commented Mar 3, 2026

Uh oh!

Honny1 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Luap99 commented Mar 4, 2026

Uh oh!

Honny1 Mar 5, 2026

Choose a reason for hiding this comment

jankaluza commented Feb 10, 2026 •

edited

Loading