diff --git a/WORKSPACE b/WORKSPACE index 51008ffbc..65703bad5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2489,11 +2489,18 @@ go_repository( version = "v1.5.2", ) +go_repository( + name = "com_github_moby_moby", + importpath = "github.com/moby/moby", + sum = "h1:uUbydai/Y9J7Ybt+lFI3zBdnsMYXnXE9vEcfZDoEE8Q=", + version = "v24.0.5+incompatible", +) + go_repository( name = "com_github_docker_docker", importpath = "github.com/docker/docker", - sum = "h1:5AkIsnQpeL7eaqsM+Vl4Xbj5eIZFpPZZzXtNyfzzK/w=", - version = "v1.4.2-0.20191028175130-9e7d5ac5ea55", + sum = "h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY=", + version = "v24.0.5+incompatible", ) go_repository( diff --git a/pkg/test/dockerutil/BUILD b/pkg/test/dockerutil/BUILD index af902403b..46cb798fd 100644 --- a/pkg/test/dockerutil/BUILD +++ b/pkg/test/dockerutil/BUILD @@ -23,9 +23,9 @@ go_library( "@com_github_docker_docker//api/types/container:go_default_library", "@com_github_docker_docker//api/types/mount:go_default_library", "@com_github_docker_docker//api/types/network:go_default_library", - "@com_github_docker_docker//client:go_default_library", - "@com_github_docker_docker//pkg/stdcopy:go_default_library", "@com_github_docker_go_connections//nat:go_default_library", + "@com_github_moby_moby//client:go_default_library", + "@com_github_moby_moby//pkg/stdcopy:go_default_library", "@org_golang_x_sys//unix:go_default_library", ], ) diff --git a/pkg/test/dockerutil/container.go b/pkg/test/dockerutil/container.go index ae5b03941..71aa87ea6 100644 --- a/pkg/test/dockerutil/container.go +++ b/pkg/test/dockerutil/container.go @@ -34,9 +34,9 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/network" - "github.com/docker/docker/client" - "github.com/docker/docker/pkg/stdcopy" "github.com/docker/go-connections/nat" + "github.com/moby/moby/client" + "github.com/moby/moby/pkg/stdcopy" "gvisor.dev/gvisor/pkg/test/testutil" ) @@ -236,7 +236,7 @@ func (c *Container) create(ctx context.Context, profileImage string, conf *conta // unmodified "basic/alpine" image name. This should be easy to grok. c.profileInit(profileImage) } - cont, err := c.client.ContainerCreate(ctx, conf, hostconf, nil, c.Name) + cont, err := c.client.ContainerCreate(ctx, conf, hostconf, nil, nil, c.Name) if err != nil { return err } @@ -299,7 +299,7 @@ func (c *Container) Start(ctx context.Context) error { // Stop is analogous to 'docker stop'. func (c *Container) Stop(ctx context.Context) error { - return c.client.ContainerStop(ctx, c.id, nil) + return c.client.ContainerStop(ctx, c.id, container.StopOptions{}) } // Pause is analogous to'docker pause'. diff --git a/pkg/test/dockerutil/exec.go b/pkg/test/dockerutil/exec.go index 63449860d..442a48fd7 100644 --- a/pkg/test/dockerutil/exec.go +++ b/pkg/test/dockerutil/exec.go @@ -21,7 +21,7 @@ import ( "time" "github.com/docker/docker/api/types" - "github.com/docker/docker/pkg/stdcopy" + "github.com/moby/moby/pkg/stdcopy" ) // ExecOpts holds arguments for Exec calls. diff --git a/pkg/test/dockerutil/network.go b/pkg/test/dockerutil/network.go index dbe17fa5e..d730b601b 100644 --- a/pkg/test/dockerutil/network.go +++ b/pkg/test/dockerutil/network.go @@ -20,7 +20,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/network" - "github.com/docker/docker/client" + "github.com/moby/moby/client" "gvisor.dev/gvisor/pkg/test/testutil" )