-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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
go.mod: update to docker v28.0.0 #12545
Conversation
42dc745
to
f055253
Compare
pkg/compose/create.go
Outdated
MacAddress: macAddress, | ||
MacAddress: macAddress, // FIXME(thaJeztah) this should be moved to networksettings -> EndpointSettings.MacAddress |
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.
Note to self; looks like we need to update this to use the new field
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.
@robmry @akerouanton could one of you help doing a follow-up to adjust the code in compose for the new approach? (I wasn't 100% sure if "only new" should be set, or "both old and new to same value")
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.
Yes, sure - "only new" should do the trick, the old field is deprecated.
For now, we migrate the container-wide MAC address to the endpoint if it's unambiguous. But, we'll remove that at some point.
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.
Thanks! I wasn't sure what would happen if we did NOT set the old one, if compose would connect to an older version of the engine, but perhaps we take care of that in the client
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.
Yes, I guess we'll have to ... the change was in API 1.44.
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.
this doesn't need a FIXME, we just support older API and migrate to new API when relevant (see prepareContainerMACAddress
)
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.
Ah! I missed that one; in that case, I may add a //nolint:
and a comment to prevent confusion; that sound good?
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.
Added; let me know if that looks good (thanks!)
c0f1494
to
5b006b2
Compare
6f5440e
to
cfd04b3
Compare
c27b3a5
to
4da4898
Compare
4da4898
to
3f3270b
Compare
I can't push to your fork so created #12564 |
3f3270b
to
2f42eba
Compare
4c26249
to
1d6ee91
Compare
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.
Sounds good to me, thanks @thaJeztah and @ndeloof 👍
1d6ee91
to
87afbc3
Compare
Derp; I must've had a different version of the linter running locally that did complain 😂
|
87afbc3
to
8c706e3
Compare
OK: fixed now 👍 |
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
8c706e3
to
f4198fb
Compare
Rebased to get a fresh run of CI |
oh! buildx 0.21.1 is there; I can update 😂 docker/docker-ce-packaging#1167 |
full diff: - moby/moby@v27.5.1...v28.0.0 - docker/cli@v27.5.1...v28.0.0 - docker/buildx@v0.20.1...v0.21.1 Co-authored-by: Nicolas De Loof <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>
Seems like it resolves the alias, and uses that instead, instead of the actual type. Signed-off-by: Sebastiaan van Stijn <[email protected]>
f4198fb
to
ea66152
Compare
Done! |
pkg/compose: stopDependentContainers: rename var that shadowed
go.mod: golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
go.mod: github.com/moby/buildkit v0.20.0
go.mod: docker/docker, docker/cli v28.0.0, buildx v0.21.0
full diff:
What I did
Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did