Merge pull request #6829 from thaJeztah/bump_modules

vendor: moby/api v1.54.0-dev, moby/client v0.2.3-dev

Author: vvoland

cli/compose/convert/service.go

@@ -572,30 +572,6 @@ func convertResources(source composetypes.Resources) (*swarm.ResourceRequirement
 	return resources, nil
 }
 
-// compareSwarmPortConfig returns the lexical ordering of a and b, and can be used
-// with [slices.SortFunc].
-//
-// The comparison is performed in the following priority order:
-//
-//  1. PublishedPort (host port)
-//  2. TargetPort (container port)
-//  3. Protocol
-//  4. PublishMode
-//
-// TODO(thaJeztah): define this on swarm.PortConfig itself to allow re-use.
-func compareSwarmPortConfig(a, b swarm.PortConfig) int {
-	if n := cmp.Compare(a.PublishedPort, b.PublishedPort); n != 0 {
-		return n
-	}
-	if n := cmp.Compare(a.TargetPort, b.TargetPort); n != 0 {
-		return n
-	}
-	if n := cmp.Compare(a.Protocol, b.Protocol); n != 0 {
-		return n
-	}
-	return cmp.Compare(a.PublishMode, b.PublishMode)
-}
-
 func convertEndpointSpec(endpointMode string, source []composetypes.ServicePortConfig) *swarm.EndpointSpec {
 	portConfigs := make([]swarm.PortConfig, 0, len(source))
 	for _, port := range source {
@@ -607,7 +583,7 @@ func convertEndpointSpec(endpointMode string, source []composetypes.ServicePortC
 		})
 	}
 
-	slices.SortFunc(portConfigs, compareSwarmPortConfig)
+	slices.SortFunc(portConfigs, swarm.PortConfig.Compare)
 
 	return &swarm.EndpointSpec{
 		Mode:  swarm.ResolutionMode(strings.ToLower(endpointMode)),

vendor.mod

@@ -28,8 +28,8 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/mattn/go-runewidth v0.0.20
 	github.com/moby/go-archive v0.2.0
-	github.com/moby/moby/api v1.53.0
-	github.com/moby/moby/client v0.2.2
+	github.com/moby/moby/api v1.53.1-0.20260227170702-52dc67c0df94
+	github.com/moby/moby/client v0.2.3-0.20260227170702-52dc67c0df94
 	github.com/moby/patternmatcher v0.6.0
 	github.com/moby/swarmkit/v2 v2.1.1
 	github.com/moby/sys/atomicwriter v0.1.0

vendor.sum

@@ -113,10 +113,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
 github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8=
 github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU=
-github.com/moby/moby/api v1.53.0 h1:PihqG1ncw4W+8mZs69jlwGXdaYBeb5brF6BL7mPIS/w=
-github.com/moby/moby/api v1.53.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
-github.com/moby/moby/client v0.2.2 h1:Pt4hRMCAIlyjL3cr8M5TrXCwKzguebPAc2do2ur7dEM=
-github.com/moby/moby/client v0.2.2/go.mod h1:2EkIPVNCqR05CMIzL1mfA07t0HvVUUOl85pasRz/GmQ=
+github.com/moby/moby/api v1.53.1-0.20260227170702-52dc67c0df94 h1:32ofGMXE5YyC9W6CRReNtpzUPfzngoHXPSRkai60e7A=
+github.com/moby/moby/api v1.53.1-0.20260227170702-52dc67c0df94/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
+github.com/moby/moby/client v0.2.3-0.20260227170702-52dc67c0df94 h1:UnDieHg5LGQYDVEpni5h67HRNvSZMP1FguKrzot3r1o=
+github.com/moby/moby/client v0.2.3-0.20260227170702-52dc67c0df94/go.mod h1:BLj1NHZAHj53G+DSOsojqE/AbtIFy+ygUNErODq1zbc=
 github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
 github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/swarmkit/v2 v2.1.1 h1:yvTJ8MMCc3f0qTA44J6R59EZ5yZawdYopkpuLk4+ICU=