go.mod: update to docker v28.0.0 #12545

thaJeztah · 2025-02-10T14:35:50Z

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

go.mod

thaJeztah · 2025-02-10T15:33:21Z

pkg/compose/create.go

-		MacAddress:      macAddress,
+		MacAddress:      macAddress, // FIXME(thaJeztah) this should be moved to networksettings -> EndpointSettings.MacAddress


Note to self; looks like we need to update this to use the new field

@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")

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.

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

Yes, I guess we'll have to ... the change was in API 1.44.

this doesn't need a FIXME, we just support older API and migrate to new API when relevant (see prepareContainerMACAddress)

Ah! I missed that one; in that case, I may add a //nolint: and a comment to prevent confusion; that sound good?

Added; let me know if that looks good (thanks!)

ndeloof · 2025-02-20T10:31:45Z

I can't push to your fork so created #12564

thaJeztah · 2025-02-20T10:44:31Z

Updated to v28.0.0 and included your fix from 152490f @ndeloof

thaJeztah · 2025-02-20T10:45:31Z

I can't push to your fork

Also not sure why that didn't work 🤔 something broken on GitHub?

glours

Sounds good to me, thanks @thaJeztah and @ndeloof 👍

thaJeztah · 2025-02-20T13:34:35Z

Derp; I must've had a different version of the linter running locally that did complain 😂

#22 114.9 pkg/compose/create.go:277:32: directive `//nolint:staticcheck // Deprecated since API v1.44, but kept for compatibility with older API versions.` is unused for linter "staticcheck" (nolintlint)

thaJeztah · 2025-02-20T13:50:12Z

OK: fixed now 👍

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah · 2025-02-21T14:11:38Z

Rebased to get a fresh run of CI

thaJeztah · 2025-02-21T14:12:38Z

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 <nicolas.deloof@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Seems like it resolves the alias, and uses that instead, instead of the actual type. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah · 2025-02-21T14:15:21Z

oh! buildx 0.21.1 is there; I can update 😂 docker/docker-ce-packaging#1167

Done!

docker/buildx@v0.21.0...v0.21.1

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | patch | `v2.33.0` -> `v2.33.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v2.33.1`](https://github.com/docker/compose/releases/tag/v2.33.1) [Compare Source](docker/compose@v2.33.0...v2.33.1) #### What's Changed ##### ✨ Improvements - Add support for gw_priority, enable_ipv4 (requires docker v28.0) by [@thaJeztah](https://github.com/thaJeztah) in docker/compose#12570 ##### 🐛 Fixes - Run watch standalone if menu fails to start by [@ndeloof](https://github.com/ndeloof) in docker/compose#12536 - Report error using non-file secret|config with read-only service by [@ndeloof](https://github.com/ndeloof) in docker/compose#12531 - Don't display bake suggestion when using --progress with quiet or json option by [@glours](https://github.com/glours) in docker/compose#12561 - Fix pull --parallel and --no-parallel deprecation warnings missing by [@maxproske](https://github.com/maxproske) in docker/compose#12555 - Fix error message when detach is implied by wait by [@ndeloof](https://github.com/ndeloof) in docker/compose#12566 ##### ⚙️ Dependencies - build(deps): bump github.com/spf13/cobra from 1.8.1 to 1.9.1 by [@dependabot](https://github.com/dependabot) in docker/compose#12556 - build(deps): bump google.golang.org/grpc from 1.68.1 to 1.70.0 by [@dependabot](https://github.com/dependabot) in docker/compose#12494 - go.mod: update to docker v28.0.0 by [@thaJeztah](https://github.com/thaJeztah) in docker/compose#12545 **Full Changelog**: docker/compose@v2.33.0...v2.33.1 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

thaJeztah commented Feb 10, 2025

View reviewed changes

go.mod Outdated Show resolved Hide resolved

thaJeztah force-pushed the bump_buildx_engine branch 3 times, most recently from 42dc745 to f055253 Compare February 10, 2025 15:32

thaJeztah commented Feb 10, 2025

View reviewed changes

thaJeztah force-pushed the bump_buildx_engine branch 6 times, most recently from c0f1494 to 5b006b2 Compare February 11, 2025 17:59

thaJeztah closed this Feb 11, 2025

thaJeztah reopened this Feb 11, 2025

thaJeztah force-pushed the bump_buildx_engine branch 2 times, most recently from 6f5440e to cfd04b3 Compare February 15, 2025 20:39

thaJeztah changed the title ~~WIP: go.mod: update to docker v28.0.0-rc.1~~ WIP: go.mod: update to docker v28.0.0-rc.2 Feb 15, 2025

thaJeztah force-pushed the bump_buildx_engine branch 4 times, most recently from c27b3a5 to 4da4898 Compare February 17, 2025 21:23

thaJeztah changed the title ~~WIP: go.mod: update to docker v28.0.0-rc.2~~ go.mod: update to docker v28.0.0-rc.2 Feb 17, 2025

thaJeztah force-pushed the bump_buildx_engine branch from 4da4898 to 3f3270b Compare February 19, 2025 13:25

thaJeztah changed the title ~~go.mod: update to docker v28.0.0-rc.2~~ go.mod: update to docker v28.0.0-rc.3 Feb 19, 2025

thaJeztah force-pushed the bump_buildx_engine branch from 3f3270b to 2f42eba Compare February 20, 2025 10:41

thaJeztah changed the title ~~go.mod: update to docker v28.0.0-rc.3~~ go.mod: update to docker v28.0.0 Feb 20, 2025

thaJeztah force-pushed the bump_buildx_engine branch 2 times, most recently from 4c26249 to 1d6ee91 Compare February 20, 2025 10:43

thaJeztah marked this pull request as ready for review February 20, 2025 10:43

thaJeztah requested a review from a team as a code owner February 20, 2025 10:43

thaJeztah requested review from ndeloof and glours February 20, 2025 10:43

glours approved these changes Feb 20, 2025

View reviewed changes

thaJeztah force-pushed the bump_buildx_engine branch from 1d6ee91 to 87afbc3 Compare February 20, 2025 13:04

thaJeztah force-pushed the bump_buildx_engine branch from 87afbc3 to 8c706e3 Compare February 20, 2025 13:35

thaJeztah added 3 commits February 21, 2025 15:08

pkg/compose: stopDependentContainers: rename var that shadowed

1b0d115

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

go.mod: golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f

411717c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

go.mod: github.com/moby/buildkit v0.20.0

5ef41ac

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah force-pushed the bump_buildx_engine branch from 8c706e3 to f4198fb Compare February 21, 2025 14:09

thaJeztah and others added 2 commits February 21, 2025 15:13

go.mod: docker/docker, docker/cli v28.0.0, buildx v0.21.1

1b86741

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 <nicolas.deloof@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

make the mocks generator happy

ea66152

Seems like it resolves the alias, and uses that instead, instead of the actual type. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah force-pushed the bump_buildx_engine branch from f4198fb to ea66152 Compare February 21, 2025 14:14

ndeloof approved these changes Feb 21, 2025

View reviewed changes

ndeloof enabled auto-merge (rebase) February 21, 2025 14:22

ndeloof merged commit 20f780e into docker:main Feb 21, 2025
24 of 25 checks passed

thaJeztah deleted the bump_buildx_engine branch February 21, 2025 14:33

BrewTestBot mentioned this pull request Feb 21, 2025

docker-compose 2.33.1 Homebrew/homebrew-core#208508

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

go.mod: update to docker v28.0.0 #12545

go.mod: update to docker v28.0.0 #12545

thaJeztah commented Feb 10, 2025 •

edited

Loading

thaJeztah Feb 10, 2025

thaJeztah Feb 20, 2025

robmry Feb 20, 2025

thaJeztah Feb 20, 2025

robmry Feb 20, 2025

ndeloof Feb 20, 2025

thaJeztah Feb 20, 2025

thaJeztah Feb 20, 2025

ndeloof commented Feb 20, 2025

thaJeztah commented Feb 20, 2025

thaJeztah commented Feb 20, 2025

glours left a comment

thaJeztah commented Feb 20, 2025

thaJeztah commented Feb 20, 2025

thaJeztah commented Feb 21, 2025

thaJeztah commented Feb 21, 2025

thaJeztah commented Feb 21, 2025

		MacAddress: macAddress,
		MacAddress: macAddress, // FIXME(thaJeztah) this should be moved to networksettings -> EndpointSettings.MacAddress

go.mod: update to docker v28.0.0 #12545

go.mod: update to docker v28.0.0 #12545

Conversation

thaJeztah commented Feb 10, 2025 • edited Loading

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ndeloof commented Feb 20, 2025

thaJeztah commented Feb 20, 2025

thaJeztah commented Feb 20, 2025

glours left a comment

Choose a reason for hiding this comment

thaJeztah commented Feb 20, 2025

thaJeztah commented Feb 20, 2025

thaJeztah commented Feb 21, 2025

thaJeztah commented Feb 21, 2025

thaJeztah commented Feb 21, 2025

thaJeztah commented Feb 10, 2025 •

edited

Loading