vendor: github.com/moby/moby/api, moby/moby/client master

Signed-off-by: Rob Murray <[email protected]>

Author: robmry

cli/command/container/attach.go

@@ -23,21 +23,21 @@ type AttachOptions struct {
 }
 
 func inspectContainerAndCheckState(ctx context.Context, apiClient client.APIClient, args string) (*container.InspectResponse, error) {
-	c, err := apiClient.ContainerInspect(ctx, args)
+	c, err := apiClient.ContainerInspect(ctx, args, client.ContainerInspectOptions{})
 	if err != nil {
 		return nil, err
 	}
-	if !c.State.Running {
+	if !c.Container.State.Running {
 		return nil, errors.New("cannot attach to a stopped container, start it first")
 	}
-	if c.State.Paused {
+	if c.Container.State.Paused {
 		return nil, errors.New("cannot attach to a paused container, unpause it first")
 	}
-	if c.State.Restarting {
+	if c.Container.State.Restarting {
 		return nil, errors.New("cannot attach to a restarting container, wait until it is running")
 	}
 
-	return &c, nil
+	return &c.Container, nil
 }
 
 // newAttachCommand creates a new cobra.Command for `docker attach`

cli/command/container/exec.go

@@ -97,7 +97,7 @@ func RunExec(ctx context.Context, dockerCLI command.Cli, containerIDorName strin
 	// otherwise if we error out we will leak execIDs on the server (and
 	// there's no easy way to clean those up). But also in order to make "not
 	// exist" errors take precedence we do a dummy inspect first.
-	if _, err := apiClient.ContainerInspect(ctx, containerIDorName); err != nil {
+	if _, err := apiClient.ContainerInspect(ctx, containerIDorName, client.ContainerInspectOptions{}); err != nil {
 		return err
 	}
 	if !options.Detach {
@@ -119,10 +119,17 @@ func RunExec(ctx context.Context, dockerCLI command.Cli, containerIDorName strin
 	}
 
 	if options.Detach {
+		var cs client.ConsoleSize
+		if execOptions.ConsoleSize != nil {
+			cs = client.ConsoleSize{
+				Height: execOptions.ConsoleSize[0],
+				Width:  execOptions.ConsoleSize[1],
+			}
+		}
 		_, err := apiClient.ExecStart(ctx, execID, client.ExecStartOptions{
 			Detach:      options.Detach,
-			Tty:         execOptions.Tty,
-			ConsoleSize: execOptions.ConsoleSize,
+			TTY:         execOptions.Tty,
+			ConsoleSize: cs,
 		})
 		return err
 	}
@@ -159,9 +166,16 @@ func interactiveExec(ctx context.Context, dockerCli command.Cli, execOptions *cl
 	fillConsoleSize(execOptions, dockerCli)
 
 	apiClient := dockerCli.Client()
+	var cs client.ConsoleSize
+	if execOptions.ConsoleSize != nil {
+		cs = client.ConsoleSize{
+			Height: execOptions.ConsoleSize[0],
+			Width:  execOptions.ConsoleSize[1],
+		}
+	}
 	resp, err := apiClient.ExecAttach(ctx, execID, client.ExecAttachOptions{
-		Tty:         execOptions.Tty,
-		ConsoleSize: execOptions.ConsoleSize,
+		TTY:         execOptions.Tty,
+		ConsoleSize: cs,
 	})
 	if err != nil {
 		return err

cli/command/container/inspect.go

@@ -11,6 +11,7 @@ import (
 	"github.com/docker/cli/cli/command/completion"
 	"github.com/docker/cli/cli/command/inspect"
 	flagsHelper "github.com/docker/cli/cli/flags"
+	"github.com/moby/moby/client"
 	"github.com/spf13/cobra"
 )
 
@@ -46,6 +47,10 @@ func newInspectCommand(dockerCLI command.Cli) *cobra.Command {
 func runInspect(ctx context.Context, dockerCLI command.Cli, opts inspectOptions) error {
 	apiClient := dockerCLI.Client()
 	return inspect.Inspect(dockerCLI.Out(), opts.refs, opts.format, func(ref string) (any, []byte, error) {
-		return apiClient.ContainerInspectWithRaw(ctx, ref, opts.size)
+		res, err := apiClient.ContainerInspect(ctx, ref, client.ContainerInspectOptions{Size: opts.size})
+		if err != nil {
+			return nil, nil, err
+		}
+		return &res.Container, nil, nil
 	})
 }

cli/command/container/logs.go

@@ -54,12 +54,12 @@ func newLogsCommand(dockerCLI command.Cli) *cobra.Command {
 }
 
 func runLogs(ctx context.Context, dockerCli command.Cli, opts *logsOptions) error {
-	c, err := dockerCli.Client().ContainerInspect(ctx, opts.container)
+	c, err := dockerCli.Client().ContainerInspect(ctx, opts.container, client.ContainerInspectOptions{})
 	if err != nil {
 		return err
 	}
 
-	responseBody, err := dockerCli.Client().ContainerLogs(ctx, c.ID, client.ContainerLogsOptions{
+	responseBody, err := dockerCli.Client().ContainerLogs(ctx, c.Container.ID, client.ContainerLogsOptions{
 		ShowStdout: true,
 		ShowStderr: true,
 		Since:      opts.since,
@@ -74,7 +74,7 @@ func runLogs(ctx context.Context, dockerCli command.Cli, opts *logsOptions) erro
 	}
 	defer responseBody.Close()
 
-	if c.Config.Tty {
+	if c.Container.Config.Tty {
 		_, err = io.Copy(dockerCli.Out(), responseBody)
 	} else {
 		_, err = stdcopy.StdCopy(dockerCli.Out(), dockerCli.Err(), responseBody)

cli/command/container/port.go

@@ -12,6 +12,7 @@ import (
 	"github.com/docker/cli/cli/command/completion"
 	"github.com/fvbommel/sortorder"
 	"github.com/moby/moby/api/types/network"
+	"github.com/moby/moby/client"
 	"github.com/spf13/cobra"
 )
 
@@ -52,7 +53,7 @@ func newPortCommand(dockerCLI command.Cli) *cobra.Command {
 // proto is specified. We should consider changing this to "any" protocol
 // for the given private port.
 func runPort(ctx context.Context, dockerCli command.Cli, opts *portOptions) error {
-	c, err := dockerCli.Client().ContainerInspect(ctx, opts.container)
+	c, err := dockerCli.Client().ContainerInspect(ctx, opts.container, client.ContainerInspectOptions{})
 	if err != nil {
 		return err
 	}
@@ -63,15 +64,15 @@ func runPort(ctx context.Context, dockerCli command.Cli, opts *portOptions) erro
 		if err != nil {
 			return err
 		}
-		frontends, exists := c.NetworkSettings.Ports[port]
+		frontends, exists := c.Container.NetworkSettings.Ports[port]
 		if !exists || len(frontends) == 0 {
 			return fmt.Errorf("no public port '%s' published for %s", opts.port, opts.container)
 		}
 		for _, frontend := range frontends {
 			out = append(out, net.JoinHostPort(frontend.HostIP.String(), frontend.HostPort))
 		}
 	} else {
-		for from, frontends := range c.NetworkSettings.Ports {
+		for from, frontends := range c.Container.NetworkSettings.Ports {
 			for _, frontend := range frontends {
 				out = append(out, fmt.Sprintf("%s -> %s", from, net.JoinHostPort(frontend.HostIP.String(), frontend.HostPort)))
 			}

cli/command/container/start.go

@@ -80,16 +80,16 @@ func RunStart(ctx context.Context, dockerCli command.Cli, opts *StartOptions) er
 
 		// 2. Attach to the container.
 		ctr := opts.Containers[0]
-		c, err := dockerCli.Client().ContainerInspect(ctx, ctr)
+		c, err := dockerCli.Client().ContainerInspect(ctx, ctr, client.ContainerInspectOptions{})
 		if err != nil {
 			return err
 		}
 
 		// We always use c.ID instead of container to maintain consistency during `docker start`
-		if !c.Config.Tty {
+		if !c.Container.Config.Tty {
 			sigc := notifyAllSignals()
 			bgCtx := context.WithoutCancel(ctx)
-			go ForwardAllSignals(bgCtx, dockerCli.Client(), c.ID, sigc)
+			go ForwardAllSignals(bgCtx, dockerCli.Client(), c.Container.ID, sigc)
 			defer signal.StopCatch(sigc)
 		}
 
@@ -100,7 +100,7 @@ func RunStart(ctx context.Context, dockerCli command.Cli, opts *StartOptions) er
 
 		options := client.ContainerAttachOptions{
 			Stream:     true,
-			Stdin:      opts.OpenStdin && c.Config.OpenStdin,
+			Stdin:      opts.OpenStdin && c.Container.Config.OpenStdin,
 			Stdout:     true,
 			Stderr:     true,
 			DetachKeys: detachKeys,
@@ -112,7 +112,7 @@ func RunStart(ctx context.Context, dockerCli command.Cli, opts *StartOptions) er
 			in = dockerCli.In()
 		}
 
-		resp, errAttach := dockerCli.Client().ContainerAttach(ctx, c.ID, options)
+		resp, errAttach := dockerCli.Client().ContainerAttach(ctx, c.Container.ID, options)
 		if errAttach != nil {
 			return errAttach
 		}
@@ -128,7 +128,7 @@ func RunStart(ctx context.Context, dockerCli command.Cli, opts *StartOptions) er
 					outputStream: dockerCli.Out(),
 					errorStream:  dockerCli.Err(),
 					resp:         resp.HijackedResponse,
-					tty:          c.Config.Tty,
+					tty:          c.Container.Config.Tty,
 					detachKeys:   options.DetachKeys,
 				}
 
@@ -142,26 +142,26 @@ func RunStart(ctx context.Context, dockerCli command.Cli, opts *StartOptions) er
 
 		// 3. We should open a channel for receiving status code of the container
 		// no matter it's detached, removed on daemon side(--rm) or exit normally.
-		statusChan := waitExitOrRemoved(ctx, dockerCli.Client(), c.ID, c.HostConfig.AutoRemove)
+		statusChan := waitExitOrRemoved(ctx, dockerCli.Client(), c.Container.ID, c.Container.HostConfig.AutoRemove)
 
 		// 4. Start the container.
-		err = dockerCli.Client().ContainerStart(ctx, c.ID, client.ContainerStartOptions{
+		err = dockerCli.Client().ContainerStart(ctx, c.Container.ID, client.ContainerStartOptions{
 			CheckpointID:  opts.Checkpoint,
 			CheckpointDir: opts.CheckpointDir,
 		})
 		if err != nil {
 			cancelFun()
 			<-cErr
-			if c.HostConfig.AutoRemove {
+			if c.Container.HostConfig.AutoRemove {
 				// wait container to be removed
 				<-statusChan
 			}
 			return err
 		}
 
 		// 5. Wait for attachment to break.
-		if c.Config.Tty && dockerCli.Out().IsTerminal() {
-			if err := MonitorTtySize(ctx, dockerCli, c.ID, false); err != nil {
+		if c.Container.Config.Tty && dockerCli.Out().IsTerminal() {
+			if err := MonitorTtySize(ctx, dockerCli, c.Container.ID, false); err != nil {
 				_, _ = fmt.Fprintln(dockerCli.Err(), "Error monitoring TTY size:", err)
 			}
 		}

cli/command/system/inspect.go

@@ -99,7 +99,11 @@ func runInspect(ctx context.Context, dockerCli command.Cli, opts inspectOptions)
 
 func inspectContainers(ctx context.Context, dockerCli command.Cli, getSize bool) inspect.GetRefFunc {
 	return func(ref string) (any, []byte, error) {
-		return dockerCli.Client().ContainerInspectWithRaw(ctx, ref, getSize)
+		res, err := dockerCli.Client().ContainerInspect(ctx, ref, client.ContainerInspectOptions{Size: getSize})
+		if err != nil {
+			return nil, nil, err
+		}
+		return res.Container, res.Raw, err
 	}
 }
 

vendor.mod

@@ -28,8 +28,8 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/mattn/go-runewidth v0.0.17
 	github.com/moby/go-archive v0.1.0
-	github.com/moby/moby/api v1.52.0-beta.2.0.20251024193508-be8d6e2f2825 // master
-	github.com/moby/moby/client v0.1.0-beta.2.0.20251024193508-be8d6e2f2825 // master
+	github.com/moby/moby/api v1.52.0-beta.2.0.20251026152250-0a134ecc1623 // master
+	github.com/moby/moby/client v0.1.0-beta.2.0.20251026152250-0a134ecc1623 // master
 	github.com/moby/patternmatcher v0.6.0
 	github.com/moby/swarmkit/v2 v2.1.0
 	github.com/moby/sys/atomicwriter v0.1.0

vendor.sum

@@ -170,10 +170,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.0.20251024193508-be8d6e2f2825 h1:hIQtHzNpFguJCWlgZ4z9L83YjLYpf9uP9+3cSYXP9hg=
-github.com/moby/moby/api v1.52.0-beta.2.0.20251024193508-be8d6e2f2825/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
-github.com/moby/moby/client v0.1.0-beta.2.0.20251024193508-be8d6e2f2825 h1:7kbhU8foMePfI9vB24bSld1RzJQpbquW8sZarquRHbY=
-github.com/moby/moby/client v0.1.0-beta.2.0.20251024193508-be8d6e2f2825/go.mod h1:sxVfwGqVgh7n+tdxA4gFToQ/lf+bM7zATnvQjVnsKT4=
+github.com/moby/moby/api v1.52.0-beta.2.0.20251026152250-0a134ecc1623 h1:9Ulm1meUBVvvSDB65RmF7VymYBGmZ0peXCVWh6fzdoM=
+github.com/moby/moby/api v1.52.0-beta.2.0.20251026152250-0a134ecc1623/go.mod h1:/ou52HkRydg4+odrUR3vFsGgjIyHvprrpEQEkweL10s=
+github.com/moby/moby/client v0.1.0-beta.2.0.20251026152250-0a134ecc1623 h1:PkaM+LLZasetNAPJX0whFXr1GXjNQWMlyMEeUAeNUnE=
+github.com/moby/moby/client v0.1.0-beta.2.0.20251026152250-0a134ecc1623/go.mod h1:sxVfwGqVgh7n+tdxA4gFToQ/lf+bM7zATnvQjVnsKT4=
 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.0 h1:u+cJ5hSyF3HnzsyI+NtegYxdIPQIuibk7IbpXNxuISM=