Update docker packages to new moby repo.

PiperOrigin-RevId: 555358714
This commit is contained in:
Zach Koopmans
2023-08-09 20:48:47 -07:00
committed by gVisor bot
parent 582bf0d72d
commit 324735cfc0
5 changed files with 17 additions and 10 deletions
+9 -2
View File
@@ -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(
+2 -2
View File
@@ -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",
],
)
+4 -4
View File
@@ -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'.
+1 -1
View File
@@ -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.
+1 -1
View File
@@ -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"
)