-
Notifications
You must be signed in to change notification settings - Fork 63
Update docker/docker (→ moby/moby) and docker/cli to v29.0.0
#459
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
Conversation
…lient Signed-off-by: Miloslav Trmač <[email protected]>
... like TestGetCredentialsInteroperability does, for the same reason. Signed-off-by: Miloslav Trmač <[email protected]>
Some of the string constants moved to internal subpackages, so just hard-code the values; that allows removing various packages from the (test-only) dependency tree. Signed-off-by: Miloslav Trmač <[email protected]>
Signed-off-by: Miloslav Trmač <[email protected]>
|
✅ A new PR has been created in buildah to vendor these changes: containers/buildah#6494 |
| github.com/distribution/reference v0.6.0 // indirect | ||
| github.com/docker/cli v28.5.2+incompatible // indirect | ||
| github.com/docker/cli v29.0.0+incompatible // indirect | ||
| github.com/docker/docker v28.5.2+incompatible // indirect |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I must be missing something here, I looked hard but I cannot figure out where this indirect github.com/docker/docker dep comes from. I feel like I have lost any understanding of how this works because AFAIK go contradicts itself here.
in the common directory:
$ go mod why github.com/docker/docker
# github.com/docker/docker
(main module does not need package github.com/docker/docker)
$ go mod why github.com/docker/cli
# github.com/docker/cli
(main module does not need package github.com/docker/cli)
I guess it has to do something around these "incompatible" versions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point, I didn’t notice that remaining, and I should have.
It comes from go.podman.io/image/v5 :) C/common refers to the last tag, and that still refers to the old module name. (go mod graph was helpful here.)
After (cd common; go mod edit -replace go.podman.io/image/v5=github.com/mtrmac/container-libs/image/v5@1fdbcec8ae39480c3313b0f1a62059a01a2ad718 && go mod tidy) (referring to the top commit of this PR) the dependencies disappear.
I don’t think the dependencies remaining matter much (they only affect version selection when using the docker/docker module path) but I would be fine with adding a follow-up PR, after this one is merged and we have a commit to refer to, to update the c/common → c/image reference.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh right, yeah I guess that is the price of the go workspace replace because the module resolver for external users works different as they don't have a local replace.
I guess I am fine knowing that this will get solved during the next release when we bump the versions in go.mod
Luap99
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
image got converted to the new docker modules which were finally renamed to moby[1]. Podman however still uses docker so now the swagger lookup seems to find duplicated types which in general breaks the generation so exclude the new module for now until we convert podman and fix the new type issues swagger found. [1] containers/container-libs#459 Signed-off-by: Paul Holzinger <[email protected]>
image got converted to the new docker modules which were finally renamed to moby[1]. Podman however still uses docker so now the swagger lookup seems to find duplicated types which in general breaks the generation so exclude the new module for now until we convert podman and fix the new type issues swagger found. [1] containers/container-libs#459 Signed-off-by: Paul Holzinger <[email protected]>
image got converted to the new docker modules which were finally renamed to moby[1]. Podman however still uses docker so now the swagger lookup seems to find duplicated types which in general breaks the generation so exclude the new module for now until we convert podman and fix the new type issues swagger found. [1] containers/container-libs#459 Signed-off-by: Paul Holzinger <[email protected]>
A superset of #456 .
moby/moby/*Go modules