Skip to content

docker: migrate to github.com/moby/moby modules#3757

Merged
dims merged 1 commit into
google:masterfrom
thaJeztah:switch_moby_modules
Jan 15, 2026
Merged

docker: migrate to github.com/moby/moby modules#3757
dims merged 1 commit into
google:masterfrom
thaJeztah:switch_moby_modules

Conversation

@thaJeztah

@thaJeztah thaJeztah commented Dec 4, 2025

Copy link
Copy Markdown
Contributor
Comment thread container/docker/handler.go Outdated
Comment on lines +239 to +253
c := ctnr
if networkMode.IsContainer() {
containerID := networkMode.ConnectedContainer()
res, err := client.ContainerInspect(context.Background(), containerID, dclient.ContainerInspectOptions{})
if err != nil {
return nil, fmt.Errorf("failed to inspect container %q: %v", id, err)
}
ipAddress = c.NetworkSettings.IPAddress
c = res.Container
}
for n, nw := range c.NetworkSettings.Networks {
if n == c.HostConfig.NetworkMode.NetworkName() {
if nw.IPAddress.IsValid() {
handler.ipAddress = nw.IPAddress.String()
}
}

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.

cc @robmry perhaps you could have a peek if this is the correct approach for the IP-address

@thaJeztah

Copy link
Copy Markdown
Contributor Author

cc @dims if you can give CI a kick to have it run 😅

dockerClient, dockerClientErr = dclient.New(
dclient.WithHost(*ArgDockerEndpoint),
dclient.WithHTTPClient(client),
dclient.WithAPIVersionNegotiation())

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.

This is now enabled by default

@dims

dims commented Dec 4, 2025

Copy link
Copy Markdown
Collaborator

cc @dims if you can give CI a kick to have it run 😅

Done!

@thaJeztah

Copy link
Copy Markdown
Contributor Author

Ah, thanks! And looks like I missed some change somewhere; let me have a look 👍

@dims

dims commented Dec 8, 2025

Copy link
Copy Markdown
Collaborator

@thaJeztah this is in draft. please do switch it over and poke me when ready.

@thaJeztah thaJeztah force-pushed the switch_moby_modules branch 3 times, most recently from 7edc676 to 524fc1e Compare December 17, 2025 09:21
@dims

dims commented Jan 14, 2026

Copy link
Copy Markdown
Collaborator

@thaJeztah when you get a chance, let's please rebase this (and drop the draft status)

@thaJeztah thaJeztah force-pushed the switch_moby_modules branch from 524fc1e to 701bec6 Compare January 14, 2026 16:07
@thaJeztah thaJeztah marked this pull request as ready for review January 14, 2026 16:08
@thaJeztah

Copy link
Copy Markdown
Contributor Author

Rebased, and moved out of draft; I should call out that the moby client dropped support for API versions older than v1.44, so no longer supports docker older than 25.0. Not sure if that's a problem for this project?

@dims

dims commented Jan 14, 2026

Copy link
Copy Markdown
Collaborator

moby client dropped support for API versions older than v1.44, so no longer supports docker older than 25.0. Not sure if that's a problem for this project?

I don't think so! will call it out in changelog

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the switch_moby_modules branch from 701bec6 to bda6459 Compare January 15, 2026 00:21
@thaJeztah

Copy link
Copy Markdown
Contributor Author

Rebased after #3812 was merged 😅

@dims dims merged commit b20bcf1 into google:master Jan 15, 2026
9 checks passed
@dims

dims commented Jan 15, 2026

Copy link
Copy Markdown
Collaborator

thanks @thaJeztah

@thaJeztah thaJeztah deleted the switch_moby_modules branch January 15, 2026 13:49
@thaJeztah

Copy link
Copy Markdown
Contributor Author

YW! Thanks for reviewing (and kicking CI 😂 )

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

Labels

None yet

2 participants