refactor: migrate Docker integration to moby/moby/client

Replace the legacy github.com/docker/docker client packages with the new
github.com/moby/moby/client (v2) API across the docker component, config,
logs, network, runtime, and waiter, updating call sites to the new
options-struct based signatures. Bump related dependencies in go.mod/go.sum.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: yinonv

cmd/envite/docker.go

@@ -7,7 +7,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/docker/docker/client"
+	"github.com/moby/moby/client"
 	"github.com/perimeterx/envite"
 	"github.com/perimeterx/envite/docker"
 )

docker/component.go

@@ -15,14 +15,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/image"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/pkg/stdcopy"
+	cerrdefs "github.com/containerd/errdefs"
+	"github.com/moby/moby/api/pkg/stdcopy"
+	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/client"
+	"github.com/moby/moby/api/types/jsonstream"
 	"github.com/perimeterx/envite"
 )
 
@@ -121,7 +118,11 @@ func (c *Component) Prepare(ctx context.Context) error {
 
 	// create a dedicated copy of the docker image to prevent
 	// other environments running concurrently from removing our image.
-	return c.cli.ImageTag(ctx, c.config.Image, c.imageCloneTag)
+	_, err = c.cli.ImageTag(ctx, client.ImageTagOptions{
+		Source: c.config.Image,
+		Target: c.imageCloneTag,
+	})
+	return err
 }
 
 // pullImage pulls the Docker image specified in the configuration.
@@ -144,7 +145,7 @@ func (c *Component) pullImage(ctx context.Context) error {
 	scanner := bufio.NewScanner(reader)
 	for scanner.Scan() {
 		bytes := scanner.Bytes()
-		msg := jsonmessage.JSONMessage{}
+		msg := jsonstream.Message{}
 		err = json.Unmarshal(bytes, &msg)
 		if err != nil {
 			return fmt.Errorf("failed to parse image pull output: %w", err)
@@ -191,17 +192,16 @@ func (c *Component) startContainer(ctx context.Context) (string, error) {
 	defer c.lock.Unlock()
 
 	var id string
-	res, err := c.cli.ContainerCreate(
-		ctx,
-		c.runConfig.containerConfig,
-		c.runConfig.hostConfig,
-		c.runConfig.networkingConfig,
-		c.runConfig.platformConfig,
-		c.containerName,
-	)
+	res, err := c.cli.ContainerCreate(ctx, client.ContainerCreateOptions{
+		Config:           c.runConfig.containerConfig,
+		HostConfig:       c.runConfig.hostConfig,
+		NetworkingConfig: c.runConfig.networkingConfig,
+		Platform:         c.runConfig.platformConfig,
+		Name:             c.containerName,
+	})
 	if err == nil {
 		id = res.ID
-	} else if !errdefs.IsConflict(err) {
+	} else if !cerrdefs.IsConflict(err) {
 		return "", fmt.Errorf("failed to create container: %w", err)
 	} else {
 		cont, err := c.findContainer(ctx)
@@ -212,7 +212,7 @@ func (c *Component) startContainer(ctx context.Context) (string, error) {
 		id = cont.ID
 	}
 
-	err = c.cli.ContainerStart(context.Background(), id, container.StartOptions{})
+	_, err = c.cli.ContainerStart(context.Background(), id, client.ContainerStartOptions{})
 	if err != nil {
 		return "", fmt.Errorf("failed to start container: %w", err)
 	}
@@ -234,13 +234,13 @@ func (c *Component) Stop(ctx context.Context) error {
 		return nil
 	}
 
-	err = c.cli.ContainerStop(ctx, cont.ID, container.StopOptions{})
+	_, err = c.cli.ContainerStop(ctx, cont.ID, client.ContainerStopOptions{})
 	if err != nil {
 		return err
 	}
 
-	err = c.cli.ContainerRemove(ctx, cont.ID, container.RemoveOptions{Force: true})
-	if err != nil && !errdefs.IsNotFound(err) && !errdefs.IsConflict(err) {
+	_, err = c.cli.ContainerRemove(ctx, cont.ID, client.ContainerRemoveOptions{Force: true})
+	if err != nil && !cerrdefs.IsNotFound(err) && !cerrdefs.IsConflict(err) {
 		return err
 	}
 
@@ -261,7 +261,7 @@ func (c *Component) Cleanup(ctx context.Context) error {
 }
 
 func (c *Component) removeImage(ctx context.Context) error {
-	_, err := c.cli.ImageRemove(ctx, c.imageCloneTag, image.RemoveOptions{})
+	_, err := c.cli.ImageRemove(ctx, c.imageCloneTag, client.ImageRemoveOptions{})
 	if err != nil && !strings.Contains(err.Error(), "reference does not exist") && !strings.Contains(err.Error(), "No such image") {
 		return err
 	}
@@ -271,8 +271,8 @@ func (c *Component) removeImage(ctx context.Context) error {
 		return nil
 	}
 
-	_, err = c.cli.ImageRemove(ctx, c.config.Image, image.RemoveOptions{})
-	if err != nil && !errdefs.IsNotFound(err) {
+	_, err = c.cli.ImageRemove(ctx, c.config.Image, client.ImageRemoveOptions{})
+	if err != nil && !cerrdefs.IsNotFound(err) {
 		return err
 	}
 
@@ -289,7 +289,7 @@ func (c *Component) Status(context.Context) (envite.ComponentStatus, error) {
 			return "", fmt.Errorf("failed to find container: %w", err)
 		}
 
-		if cont == nil || cont.State != "running" {
+		if cont == nil || cont.State != container.StateRunning {
 			status = envite.ComponentStatusStopped
 			c.status.Store(envite.ComponentStatusStopped)
 		}
@@ -327,17 +327,16 @@ func (c *Component) Exec(ctx context.Context, cmd []string) (int, error) {
 	}
 
 	c.Writer().WriteString(c.Writer().Color.Cyan(fmt.Sprintf("executing: %s", strings.Join(cmd, " "))))
-	response, err := c.cli.ContainerExecCreate(ctx, cont.ID, container.ExecOptions{
+	response, err := c.cli.ExecCreate(ctx, cont.ID, client.ExecCreateOptions{
 		Cmd:          cmd,
-		Detach:       false,
 		AttachStdout: true,
 		AttachStderr: true,
 	})
 	if err != nil {
 		return 0, fmt.Errorf("failed to create exec: %w", err)
 	}
 
-	hijack, err := c.cli.ContainerExecAttach(ctx, response.ID, container.ExecStartOptions{})
+	hijack, err := c.cli.ExecAttach(ctx, response.ID, client.ExecAttachOptions{})
 	if err != nil {
 		return 0, fmt.Errorf("failed to attach exec: %w", err)
 	}
@@ -349,7 +348,7 @@ func (c *Component) Exec(ctx context.Context, cmd []string) (int, error) {
 
 	hijack.Close()
 
-	execResp, err := c.cli.ContainerExecInspect(ctx, response.ID)
+	execResp, err := c.cli.ExecInspect(ctx, response.ID, client.ExecInspectOptions{})
 	if err != nil {
 		return 0, fmt.Errorf("failed to inspect exec: %w", err)
 	}
@@ -358,16 +357,16 @@ func (c *Component) Exec(ctx context.Context, cmd []string) (int, error) {
 	return execResp.ExitCode, nil
 }
 
-func (c *Component) findContainer(ctx context.Context) (*types.Container, error) {
-	containers, err := c.cli.ContainerList(ctx, container.ListOptions{
+func (c *Component) findContainer(ctx context.Context) (*container.Summary, error) {
+	listResult, err := c.cli.ContainerList(ctx, client.ContainerListOptions{
 		All:     true,
-		Filters: filters.NewArgs(filters.Arg("name", c.containerName)),
+		Filters: make(client.Filters).Add("name", c.containerName),
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to list containers: %w", err)
 	}
 
-	for _, co := range containers {
+	for _, co := range listResult.Items {
 		if len(co.Names) > 0 && co.Names[0][1:] == c.containerName {
 			return &co, nil
 		}

docker/config.go

@@ -6,18 +6,21 @@ package docker
 
 import (
 	"fmt"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/blkiodev"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/image"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/strslice"
+	"net/netip"
+	"os"
+	"strings"
+	"time"
+
 	"github.com/docker/go-units"
+	"github.com/moby/moby/api/types/blkiodev"
+	"github.com/moby/moby/api/types/container"
+	"github.com/moby/moby/api/types/mount"
+	"github.com/moby/moby/api/types/network"
+	"github.com/moby/moby/api/types/registry"
+	"github.com/moby/moby/api/types/strslice"
+	mobyclient "github.com/moby/moby/client"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"gopkg.in/yaml.v3"
-	"os"
-	"time"
 )
 
 // Config represents Docker Component configuration
@@ -287,7 +290,7 @@ type ImagePullOptions struct {
 
 	// PrivilegeFunc - used for https://github.com/moby/moby/blob/v24.0.6/api/types/client.go#L281
 	// available only via code, not available in config files
-	PrivilegeFunc types.RequestPrivilegeFunc `json:"-"`
+	PrivilegeFunc registry.RequestAuthConfig `json:"-"`
 
 	// Platform - used for https://github.com/moby/moby/blob/v24.0.6/api/types/client.go#L282
 	Platform string `json:"platform,omitempty"`
@@ -643,30 +646,65 @@ func (c Config) initialize(network *Network, imageCloneTag string) (*runConfig,
 	return result, nil
 }
 
-func (c Config) imagePullOptions() (image.PullOptions, error) {
-	result := image.PullOptions{}
+func (c Config) imagePullOptions() (mobyclient.ImagePullOptions, error) {
+	result := mobyclient.ImagePullOptions{}
 
 	if c.ImagePullOptions != nil {
 		var auth string
 		if c.ImagePullOptions.RegistryAuthFunc != nil {
 			var err error
 			auth, err = c.ImagePullOptions.RegistryAuthFunc()
 			if err != nil {
-				return image.PullOptions{}, fmt.Errorf("failed to get registry auth: %w", err)
+				return mobyclient.ImagePullOptions{}, fmt.Errorf("failed to get registry auth: %w", err)
 			}
 		} else {
 			auth = c.ImagePullOptions.RegistryAuth
 		}
 
+		platforms, err := parsePlatforms(c.ImagePullOptions.Platform)
+		if err != nil {
+			return mobyclient.ImagePullOptions{}, err
+		}
+
 		result.All = c.ImagePullOptions.All
 		result.RegistryAuth = auth
 		result.PrivilegeFunc = c.ImagePullOptions.PrivilegeFunc
-		result.Platform = c.ImagePullOptions.Platform
+		result.Platforms = platforms
 	}
 
 	return result, nil
 }
 
+func parseDNSAddrs(addrs []string) []netip.Addr {
+	result := make([]netip.Addr, 0, len(addrs))
+	for _, addr := range addrs {
+		parsed, err := netip.ParseAddr(addr)
+		if err != nil {
+			continue
+		}
+		result = append(result, parsed)
+	}
+	return result
+}
+
+func parsePlatforms(platform string) ([]ocispec.Platform, error) {
+	if platform == "" {
+		return nil, nil
+	}
+
+	parts := strings.Split(platform, "/")
+	switch len(parts) {
+	case 1:
+		return []ocispec.Platform{{Architecture: parts[0]}}, nil
+	case 2:
+		return []ocispec.Platform{{OS: parts[0], Architecture: parts[1]}}, nil
+	case 3:
+		return []ocispec.Platform{{OS: parts[0], Architecture: parts[1], Variant: parts[2]}}, nil
+	default:
+		return nil, fmt.Errorf("invalid platform %q", platform)
+	}
+}
+
 func (c Config) containerConfig(imageCloneTag string) *container.Config {
 	env := make([]string, 0, len(c.Env))
 	for key, value := range c.Env {
@@ -693,7 +731,6 @@ func (c Config) containerConfig(imageCloneTag string) *container.Config {
 		WorkingDir:      c.WorkingDir,
 		Entrypoint:      strslice.StrSlice(c.Entrypoint),
 		NetworkDisabled: c.NetworkDisabled,
-		MacAddress:      c.MacAddress,
 		OnBuild:         c.OnBuild,
 		Labels:          c.Labels,
 		StopSignal:      c.StopSignal,
@@ -734,7 +771,7 @@ func (c Config) hostConfig(network *Network) *container.HostConfig {
 		CapAdd:          strslice.StrSlice(c.CapAdd),
 		CapDrop:         strslice.StrSlice(c.CapDrop),
 		CgroupnsMode:    c.CgroupnsMode,
-		DNS:             c.DNS,
+		DNS:             parseDNSAddrs(c.DNS),
 		DNSOptions:      c.DNSOptions,
 		DNSSearch:       c.DNSSearch,
 		ExtraHosts:      c.ExtraHosts,
@@ -811,7 +848,6 @@ func (c *Resources) build() container.Resources {
 		Devices:              mapSlice(c.Devices, DeviceMapping.build),
 		DeviceCgroupRules:    c.DeviceCgroupRules,
 		DeviceRequests:       mapSlice(c.DeviceRequests, DeviceRequest.build),
-		KernelMemoryTCP:      c.KernelMemoryTCP,
 		MemoryReservation:    c.MemoryReservation,
 		MemorySwap:           c.MemorySwap,
 		MemorySwappiness:     c.MemorySwappiness,

docker/logs.go

@@ -7,9 +7,8 @@ package docker
 import (
 	"bufio"
 	"context"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/stdcopy"
+	"github.com/moby/moby/api/pkg/stdcopy"
+	"github.com/moby/moby/client"
 	"strings"
 	"time"
 )
@@ -18,7 +17,7 @@ type logHandler func(timestamp time.Time, text string, stream stdcopy.StdType) (
 
 // followLogs attaches to container's output
 func followLogs(ctx context.Context, cli *client.Client, id string, handler logHandler) error {
-	containerReader, err := cli.ContainerLogs(ctx, id, container.LogsOptions{
+	containerReader, err := cli.ContainerLogs(ctx, id, client.ContainerLogsOptions{
 		ShowStdout: true,
 		ShowStderr: true,
 		Timestamps: true,