SQUASH: update to moby api beta4, client beta3

robmry · robmry · commit e4176eb11bc8 · 2025-10-31T20:26:19.000Z
Signed-off-by: Rob Murray &lt;rob.murray@docker.com&gt;
diff --git a/client/client.go b/client/client.go
@@ -136,7 +136,7 @@ func (c *sdkClient) init() error {
 
 	opts = append(opts, client.WithHTTPHeaders(httpHeaders))
 
-	api, err := client.NewClientWithOpts(opts...)
+	api, err := client.New(opts...)
 	if err != nil {
 		return fmt.Errorf("new client: %w", err)
 	}
diff --git a/client/client.network.go b/client/client.network.go
@@ -3,12 +3,11 @@ package client
 import (
 	"context"
 
-	"github.com/moby/moby/api/types/network"
 	"github.com/moby/moby/client"
 )
 
 // NetworkCreate creates a new network
-func (c *sdkClient) NetworkCreate(ctx context.Context, name string, options client.NetworkCreateOptions) (network.CreateResponse, error) {
+func (c *sdkClient) NetworkCreate(ctx context.Context, name string, options client.NetworkCreateOptions) (client.NetworkCreateResult, error) {
 	// Add the labels that identify this as a network created by the SDK.
 	AddSDKLabels(options.Labels)
 
diff --git a/client/go.mod b/client/go.mod
@@ -11,13 +11,12 @@ require (
 	github.com/caarlos0/env/v11 v11.3.1
 	github.com/containerd/errdefs v1.0.0
 	github.com/docker/go-sdk/context v0.1.0-alpha011
-	github.com/moby/moby/api v1.52.0-beta.2
-	github.com/moby/moby/client v0.1.0-beta.2
+	github.com/moby/moby/api v1.52.0-beta.4
+	github.com/moby/moby/client v0.1.0-beta.3
 	github.com/stretchr/testify v1.10.0
 )
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -29,7 +28,6 @@ require (
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/term v0.5.2 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
diff --git a/client/go.sum b/client/go.sum
@@ -1,5 +1,3 @@
-github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
-github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA=
@@ -8,8 +6,6 @@ github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG
 github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
 github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
 github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
-github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
-github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
@@ -35,12 +31,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
-github.com/moby/moby/api v1.52.0-beta.2 h1:cuilbu4cLBZnlNpJXuv3QTleOxgo3kGqkNGt3ICe1yY=
-github.com/moby/moby/api v1.52.0-beta.2/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
-github.com/moby/moby/client v0.1.0-beta.2 h1:Uy7JhcAOvQAQriowODpHaAJokfw/AhUya0216sk1hAk=
-github.com/moby/moby/client v0.1.0-beta.2/go.mod h1:yYEv2G6pYi8u63ga0zlU9KsM7DpoGXubtMaZMJE7/dw=
-github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
-github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
+github.com/moby/moby/api v1.52.0-beta.4 h1:p05ztW787RcwcQx8YFcda1sb0ExqxDLHTjBQA3Jq6BY=
+github.com/moby/moby/api v1.52.0-beta.4/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
+github.com/moby/moby/client v0.1.0-beta.3 h1:y/ed2VpRmW8As56TFOaXF2zVSli38IS032zAAGt6kcI=
+github.com/moby/moby/client v0.1.0-beta.3/go.mod h1:dvvUX065yfMkFXvPk14AXVz8wmew2MdeXJ/rcYEPr7g=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
@@ -65,7 +59,6 @@ go.opentelemetry.io/otel/sdk/metric v1.36.0 h1:r0ntwwGosWGaa0CrSt8cuNuTcccMXERFw
 go.opentelemetry.io/otel/sdk/metric v1.36.0/go.mod h1:qTNOhFDfKRwX0yXOqJYegL5WRaW376QbB7P4Pb0qva4=
 go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mxVK7z4=
 go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/config/go.mod b/config/go.mod
@@ -4,7 +4,7 @@ go 1.23.6
 
 require (
 	github.com/distribution/reference v0.6.0
-	github.com/moby/moby/api v1.52.0-beta.2
+	github.com/moby/moby/api v1.52.0-beta.4
 	github.com/stretchr/testify v1.10.0
 )
 
diff --git a/config/go.sum b/config/go.sum
@@ -12,8 +12,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/moby/moby/api v1.52.0-beta.2 h1:cuilbu4cLBZnlNpJXuv3QTleOxgo3kGqkNGt3ICe1yY=
-github.com/moby/moby/api v1.52.0-beta.2/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
+github.com/moby/moby/api v1.52.0-beta.4 h1:p05ztW787RcwcQx8YFcda1sb0ExqxDLHTjBQA3Jq6BY=
+github.com/moby/moby/api v1.52.0-beta.4/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
diff --git a/container/container.run_test.go b/container/container.run_test.go
@@ -875,7 +875,7 @@ func TestRunWithWaitStrategy(t *testing.T) {
 	})
 }
 
-func testCreateNetwork(t *testing.T, networkName string) apinetwork.CreateResponse {
+func testCreateNetwork(t *testing.T, networkName string) dockerclient.NetworkCreateResult {
 	t.Helper()
 
 	dockerClient, err := client.New(context.TODO())
diff --git a/container/go.mod b/container/go.mod
@@ -20,8 +20,8 @@ require (
 	github.com/docker/go-sdk/config v0.1.0-alpha011
 	github.com/docker/go-sdk/image v0.1.0-alpha012
 	github.com/docker/go-sdk/network v0.1.0-alpha011
-	github.com/moby/moby/api v1.52.0-beta.2
-	github.com/moby/moby/client v0.1.0-beta.2
+	github.com/moby/moby/api v1.52.0-beta.4
+	github.com/moby/moby/client v0.1.0-beta.3
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/sys v0.35.0
 )
diff --git a/container/go.sum b/container/go.sum
@@ -52,10 +52,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.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
 github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
-github.com/moby/moby/api v1.52.0-beta.2 h1:cuilbu4cLBZnlNpJXuv3QTleOxgo3kGqkNGt3ICe1yY=
-github.com/moby/moby/api v1.52.0-beta.2/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
-github.com/moby/moby/client v0.1.0-beta.2 h1:Uy7JhcAOvQAQriowODpHaAJokfw/AhUya0216sk1hAk=
-github.com/moby/moby/client v0.1.0-beta.2/go.mod h1:yYEv2G6pYi8u63ga0zlU9KsM7DpoGXubtMaZMJE7/dw=
+github.com/moby/moby/api v1.52.0-beta.4 h1:p05ztW787RcwcQx8YFcda1sb0ExqxDLHTjBQA3Jq6BY=
+github.com/moby/moby/api v1.52.0-beta.4/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
+github.com/moby/moby/client v0.1.0-beta.3 h1:y/ed2VpRmW8As56TFOaXF2zVSli38IS032zAAGt6kcI=
+github.com/moby/moby/client v0.1.0-beta.3/go.mod h1:dvvUX065yfMkFXvPk14AXVz8wmew2MdeXJ/rcYEPr7g=
 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/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
diff --git a/container/lifecycle.create_test.go b/container/lifecycle.create_test.go
@@ -419,7 +419,7 @@ func TestLifecycleHooks_WithMultipleHooks(t *testing.T) {
 	require.Len(t, regexp.MustCompile("Stopping container").FindAllString(log, -1), 6)
 }
 
-func testCreateNetwork(t *testing.T, networkName string) network.CreateResponse {
+func testCreateNetwork(t *testing.T, networkName string) dockerclient.NetworkCreateResult {
 	t.Helper()
 
 	dockerClient, err := client.New(context.TODO())
diff --git a/container/lifecycle.go b/container/lifecycle.go
@@ -308,8 +308,13 @@ var defaultPullHook = []DefinitionHook{
 			pullOpts = append(pullOpts, def.pullOptions...)
 
 			// apply platform last
-			pullOpt := dockerclient.ImagePullOptions{
-				Platform: def.imagePlatform, // may be empty
+			var pullOpt dockerclient.ImagePullOptions
+			if def.imagePlatform != "" {
+				p, err := platforms.Parse(def.imagePlatform)
+				if err != nil {
+					return fmt.Errorf("invalid platform %s: %w", def.imagePlatform, err)
+				}
+				pullOpt.Platforms = append(pullOpt.Platforms, p)
 			}
 			pullOpts = append(pullOpts, image.WithPullOptions(pullOpt))
 
diff --git a/context/go.mod b/context/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/moby/moby/api v1.52.0-beta.2 // indirect
+	github.com/moby/moby/api v1.52.0-beta.4 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/context/go.sum b/context/go.sum
@@ -9,8 +9,8 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/moby/moby/api v1.52.0-beta.2 h1:cuilbu4cLBZnlNpJXuv3QTleOxgo3kGqkNGt3ICe1yY=
-github.com/moby/moby/api v1.52.0-beta.2/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
+github.com/moby/moby/api v1.52.0-beta.4 h1:p05ztW787RcwcQx8YFcda1sb0ExqxDLHTjBQA3Jq6BY=
+github.com/moby/moby/api v1.52.0-beta.4/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
diff --git a/go.work b/go.work
@@ -10,7 +10,3 @@ use (
 	./network
 	./volume
 )
-
-replace github.com/moby/moby/api => github.com/moby/moby/api v0.0.0-20251029225139-7a97e1cb401f
-
-replace github.com/moby/moby/client => github.com/moby/moby/client v0.0.0-20251029225139-7a97e1cb401f
diff --git a/go.work.sum b/go.work.sum
@@ -84,9 +84,11 @@ github.com/moby/moby/api v0.0.0-20251022164246-00abc3a9d5c6/go.mod h1:/ou52HkRyd
 github.com/moby/moby/api v0.0.0-20251026152250-0a134ecc1623/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
 github.com/moby/moby/api v0.0.0-20251029225139-7a97e1cb401f h1:jvrxd76X6jryoJNPOxvicvq/qnToY/vw5Xgi4tAvbeE=
 github.com/moby/moby/api v0.0.0-20251029225139-7a97e1cb401f/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
+github.com/moby/moby/api v1.52.0-beta.4/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
 github.com/moby/moby/client v0.0.0-20251022164246-00abc3a9d5c6/go.mod h1:sxVfwGqVgh7n+tdxA4gFToQ/lf+bM7zATnvQjVnsKT4=
 github.com/moby/moby/client v0.0.0-20251029225139-7a97e1cb401f h1:itouVus9BFfARHQdPfLF64/jIr45iISNmwhr3r4s7gQ=
 github.com/moby/moby/client v0.0.0-20251029225139-7a97e1cb401f/go.mod h1:1YrJTvhL771Q4xiwwe72NSS17lgsCF67xu8fEfSd77g=
+github.com/moby/moby/client v0.1.0-beta.3/go.mod h1:dvvUX065yfMkFXvPk14AXVz8wmew2MdeXJ/rcYEPr7g=
 github.com/moby/sys/mount v0.3.4 h1:yn5jq4STPztkkzSKpZkLcmjue+bZJ0u2AuQY1iNI1Ww=
 github.com/moby/sys/mount v0.3.4/go.mod h1:KcQJMbQdJHPlq5lcYT+/CjatWM4PuxKe+XLSVS4J6Os=
 github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
diff --git a/image/build.log.go b/image/build.log.go
@@ -5,7 +5,7 @@ import (
 	"log/slog"
 	"strings"
 
-	"github.com/moby/moby/client/pkg/jsonmessage"
+	"github.com/moby/moby/api/types/jsonstream"
 )
 
 // loggerWriter is a custom writer that forwards to the slog.Logger
@@ -16,7 +16,7 @@ type loggerWriter struct {
 // Write writes the message to the logger.
 func (lw *loggerWriter) Write(p []byte) (int, error) {
 	// Try to parse as JSON message first
-	var msg jsonmessage.JSONMessage
+	var msg jsonstream.Message
 	if err := json.Unmarshal(p, &msg); err == nil {
 		// It's a JSON message, log it structured and there is no default case because
 		// empty JSON messages should not be logged, to avoid noise.
diff --git a/image/build.log_test.go b/image/build.log_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	"github.com/moby/moby/api/types/jsonstream"
-	"github.com/moby/moby/client/pkg/jsonmessage"
 	"github.com/stretchr/testify/require"
 )
 
@@ -55,7 +54,7 @@ func testLoggerWriterWithJSONError(t *testing.T) {
 	logger := slog.New(slog.NewTextHandler(buf, nil))
 	writer := &loggerWriter{logger: logger}
 
-	errorMsg := jsonmessage.JSONMessage{
+	errorMsg := jsonstream.Message{
 		Error: &jsonstream.Error{
 			Message: "build failed",
 		},
@@ -80,7 +79,7 @@ func testLoggerWriterWithJSONStream(t *testing.T) {
 	logger := slog.New(slog.NewTextHandler(buf, nil))
 	writer := &loggerWriter{logger: logger}
 
-	streamMsg := jsonmessage.JSONMessage{
+	streamMsg := jsonstream.Message{
 		Stream: "Step 1/3 : FROM ubuntu:latest",
 	}
 	jsonData, err := json.Marshal(streamMsg)
@@ -102,7 +101,7 @@ func testLoggerWriterWithJSONStatus(t *testing.T) {
 	logger := slog.New(slog.NewTextHandler(buf, nil))
 	writer := &loggerWriter{logger: logger}
 
-	statusMsg := jsonmessage.JSONMessage{
+	statusMsg := jsonstream.Message{
 		Status: "Downloading",
 		ID:     "abc123",
 	}
@@ -177,7 +176,7 @@ func testLoggerWriterStreamWithNewline(t *testing.T) {
 	logger := slog.New(slog.NewTextHandler(buf, nil))
 	writer := &loggerWriter{logger: logger}
 
-	streamMsg := jsonmessage.JSONMessage{
+	streamMsg := jsonstream.Message{
 		Stream: "Step 1/3 : FROM ubuntu:latest\n",
 	}
 	jsonData, err := json.Marshal(streamMsg)
@@ -200,10 +199,10 @@ func testLoggerWriterStatusWithProgress(t *testing.T) {
 	logger := slog.New(slog.NewTextHandler(buf, nil))
 	writer := &loggerWriter{logger: logger}
 
-	statusMsg := jsonmessage.JSONMessage{
+	statusMsg := jsonstream.Message{
 		Status:   "Downloading",
 		ID:       "abc123",
-		Progress: &jsonmessage.JSONProgress{Progress: jsonstream.Progress{Current: 1024, Total: 2048}},
+		Progress: &jsonstream.Progress{Current: 1024, Total: 2048},
 	}
 	jsonData, err := json.Marshal(statusMsg)
 	require.NoError(t, err)
@@ -275,7 +274,7 @@ func testLoggerWriterWithEmptyJSONFields(t *testing.T) {
 	logger := slog.New(slog.NewTextHandler(buf, nil))
 	writer := &loggerWriter{logger: logger}
 
-	emptyMsg := jsonmessage.JSONMessage{
+	emptyMsg := jsonstream.Message{
 		Stream: "",
 		Status: "",
 		ID:     "",
diff --git a/image/go.mod b/image/go.mod
@@ -14,8 +14,8 @@ require (
 	github.com/docker/go-sdk/client v0.1.0-alpha011
 	github.com/docker/go-sdk/config v0.1.0-alpha011
 	github.com/moby/go-archive v0.1.0
-	github.com/moby/moby/api v1.52.0-beta.2
-	github.com/moby/moby/client v0.1.0-beta.2
+	github.com/moby/moby/api v1.52.0-beta.4
+	github.com/moby/moby/client v0.1.0-beta.3
 	github.com/moby/patternmatcher v0.6.0
 	github.com/moby/term v0.5.2
 	github.com/opencontainers/image-spec v1.1.1
diff --git a/image/go.sum b/image/go.sum
@@ -46,10 +46,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.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
 github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
-github.com/moby/moby/api v1.52.0-beta.2 h1:cuilbu4cLBZnlNpJXuv3QTleOxgo3kGqkNGt3ICe1yY=
-github.com/moby/moby/api v1.52.0-beta.2/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
-github.com/moby/moby/client v0.1.0-beta.2 h1:Uy7JhcAOvQAQriowODpHaAJokfw/AhUya0216sk1hAk=
-github.com/moby/moby/client v0.1.0-beta.2/go.mod h1:yYEv2G6pYi8u63ga0zlU9KsM7DpoGXubtMaZMJE7/dw=
+github.com/moby/moby/api v1.52.0-beta.4 h1:p05ztW787RcwcQx8YFcda1sb0ExqxDLHTjBQA3Jq6BY=
+github.com/moby/moby/api v1.52.0-beta.4/go.mod h1:v0K/motq8oWmx+rtApG1rBTIpQ8KUONUjpf+U73gags=
+github.com/moby/moby/client v0.1.0-beta.3 h1:y/ed2VpRmW8As56TFOaXF2zVSli38IS032zAAGt6kcI=
+github.com/moby/moby/client v0.1.0-beta.3/go.mod h1:dvvUX065yfMkFXvPk14AXVz8wmew2MdeXJ/rcYEPr7g=
 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/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
diff --git a/image/pull.go b/image/pull.go
@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
-
 	"github.com/moby/moby/api/pkg/authconfig"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/moby/moby/client/pkg/jsonmessage"
diff --git a/image/pull_benchmark_test.go b/image/pull_benchmark_test.go
@@ -8,8 +8,8 @@ import (
 	"log/slog"
 	"testing"
 
+	"github.com/moby/moby/api/types/jsonstream"
 	"github.com/moby/moby/client"
-	"github.com/moby/moby/client/pkg/jsonmessage"
 	"github.com/stretchr/testify/require"
 
 	sdkclient "github.com/docker/go-sdk/client"
@@ -49,7 +49,7 @@ type mockImagePullResponse struct {
 	io.ReadCloser
 }
 
-func (f mockImagePullResponse) JSONMessages(_ context.Context) iter.Seq2[jsonmessage.JSONMessage, error] {
+func (f mockImagePullResponse) JSONMessages(_ context.Context) iter.Seq2[jsonstream.Message, error] {
 	return nil
 }
 
diff --git a/image/pull_examples_test.go b/image/pull_examples_test.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	dockerclient "github.com/moby/moby/client"
+	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 
 	"github.com/docker/go-sdk/client"
 	"github.com/docker/go-sdk/image"
@@ -40,9 +41,12 @@ func ExamplePull_withClient() {
 }
 
 func ExamplePull_withPullOptions() {
-	opts := dockerclient.ImagePullOptions{
-		Platform: "linux/amd64",
-	}
+	opts := dockerclient.ImagePullOptions{Platforms: []v1.Platform{
+		{
+			OS:           "linux",
+			Architecture: "amd64",
+		},
+	}}
 
 	err := image.Pull(context.Background(), "alpine:3.22", image.WithPullOptions(opts))
 
@@ -53,9 +57,12 @@ func ExamplePull_withPullOptions() {
 }
 
 func ExamplePull_withPullHandler() {
-	opts := dockerclient.ImagePullOptions{
-		Platform: "linux/amd64",
-	}
+	opts := dockerclient.ImagePullOptions{Platforms: []v1.Platform{
+		{
+			OS:           "linux",
+			Architecture: "amd64",
+		},
+	}}
 
 	buff := &bytes.Buffer{}
 
diff --git a/legacyadapters/go.mod b/legacyadapters/go.mod
@@ -7,7 +7,7 @@ replace github.com/docker/go-sdk/config => ../config
 require (
 	github.com/docker/cli v28.3.2+incompatible
 	github.com/docker/go-sdk/config v0.1.0-alpha011
-	github.com/moby/moby/api v1.52.0-beta.2
+	github.com/moby/moby/api v1.52.0-beta.4
 	github.com/stretchr/testify v1.10.0
 )
 
diff --git a/legacyadapters/go.sum b/legacyadapters/go.sum
diff --git a/network/go.mod b/network/go.mod
diff --git a/network/go.sum b/network/go.sum
diff --git a/network/network.go b/network/network.go
diff --git a/network/testing.go b/network/testing.go
diff --git a/network/types.go b/network/types.go
diff --git a/volume/go.mod b/volume/go.mod
diff --git a/volume/go.sum b/volume/go.sum

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func (c *sdkClient) init() error {`
`136`	`136`
`137`	`137`	`opts = append(opts, client.WithHTTPHeaders(httpHeaders))`
`138`	`138`
`139`		`- api, err := client.NewClientWithOpts(opts...)`
	`139`	`+ api, err := client.New(opts...)`
`140`	`140`	`if err != nil {`
`141`	`141`	`return fmt.Errorf("new client: %w", err)`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ go 1.23.6`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/distribution/reference v0.6.0`
`7`		`- github.com/moby/moby/api v1.52.0-beta.2`
	`7`	`+ github.com/moby/moby/api v1.52.0-beta.4`
`8`	`8`	`github.com/stretchr/testify v1.10.0`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -875,7 +875,7 @@ func TestRunWithWaitStrategy(t *testing.T) {`
`875`	`875`	`})`
`876`	`876`	`}`
`877`	`877`
`878`		`-func testCreateNetwork(t *testing.T, networkName string) apinetwork.CreateResponse {`
	`878`	`+func testCreateNetwork(t *testing.T, networkName string) dockerclient.NetworkCreateResult {`
`879`	`879`	`t.Helper()`
`880`	`880`
`881`	`881`	`dockerClient, err := client.New(context.TODO())`
Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ func TestLifecycleHooks_WithMultipleHooks(t *testing.T) {`
`419`	`419`	`require.Len(t, regexp.MustCompile("Stopping container").FindAllString(log, -1), 6)`
`420`	`420`	`}`
`421`	`421`
`422`		`-func testCreateNetwork(t *testing.T, networkName string) network.CreateResponse {`
	`422`	`+func testCreateNetwork(t *testing.T, networkName string) dockerclient.NetworkCreateResult {`
`423`	`423`	`t.Helper()`
`424`	`424`
`425`	`425`	`dockerClient, err := client.New(context.TODO())`