From 8193d86d2f8bb771c38e871d5deae212059921f7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 27 Nov 2025 18:24:24 +0100 Subject: [PATCH] pkg/bridge: remove uses of go-connections Signed-off-by: Sebastiaan van Stijn --- go.mod | 2 +- pkg/bridge/convert.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 13c8dd398..595f80e8a 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,6 @@ require ( github.com/docker/cli v29.2.1+incompatible github.com/docker/cli-docs-tool v0.11.0 github.com/docker/docker v28.5.2+incompatible - github.com/docker/go-connections v0.6.0 github.com/docker/go-units v0.5.0 github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 github.com/fsnotify/fsevents v0.2.0 @@ -75,6 +74,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.9.5 // indirect + github.com/docker/go-connections v0.6.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fvbommel/sortorder v1.1.0 // indirect github.com/go-logr/logr v1.4.3 // indirect diff --git a/pkg/bridge/convert.go b/pkg/bridge/convert.go index 3edd187cd..adf676eab 100644 --- a/pkg/bridge/convert.go +++ b/pkg/bridge/convert.go @@ -30,7 +30,6 @@ import ( "github.com/containerd/errdefs" "github.com/docker/cli/cli/command" cli "github.com/docker/cli/cli/command/container" - "github.com/docker/go-connections/nat" "github.com/moby/moby/api/types/container" "github.com/moby/moby/api/types/image" "github.com/moby/moby/api/types/network" @@ -175,7 +174,11 @@ func LoadAdditionalResources(ctx context.Context, dockerCLI command.Cli, project exposed := utils.Set[string]{} exposed.AddAll(service.Expose...) for port := range inspect.Config.ExposedPorts { - exposed.Add(nat.Port(port).Port()) + p, err := network.ParsePort(port) + if err != nil { + return nil, err + } + exposed.Add(strconv.Itoa(int(p.Num()))) } for _, port := range service.Ports { exposed.Add(strconv.Itoa(int(port.Target)))