diff --git a/WORKSPACE b/WORKSPACE index ab782b767e..273e49a753 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2800,18 +2800,11 @@ go_repository( version = "v1.3.1", ) -go_repository( - name = "com_github_moby_moby", - importpath = "github.com/moby/moby", - sum = "h1:AhSu/R7C5uiyd+JCts3kxrKyTzXa3FilBJ0KCLUHXqA=", - version = "v27.3.0+incompatible", -) - go_repository( name = "com_github_docker_docker", importpath = "github.com/docker/docker", - sum = "h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A=", - version = "v27.3.0+incompatible", + sum = "h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=", + version = "v28.1.1+incompatible", ) go_repository( diff --git a/pkg/test/dockerutil/BUILD b/pkg/test/dockerutil/BUILD index 894e7d97a3..a088a54b5b 100644 --- a/pkg/test/dockerutil/BUILD +++ b/pkg/test/dockerutil/BUILD @@ -41,9 +41,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 60206867cf..b0a6a140c1 100644 --- a/pkg/test/dockerutil/container.go +++ b/pkg/test/dockerutil/container.go @@ -36,9 +36,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/sync" "gvisor.dev/gvisor/pkg/test/testutil" ) diff --git a/pkg/test/dockerutil/exec.go b/pkg/test/dockerutil/exec.go index 00c64e4be4..4da2c5c023 100644 --- a/pkg/test/dockerutil/exec.go +++ b/pkg/test/dockerutil/exec.go @@ -22,7 +22,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" - "github.com/moby/moby/pkg/stdcopy" + "github.com/docker/docker/pkg/stdcopy" ) // ExecOpts holds arguments for Exec calls. diff --git a/pkg/test/dockerutil/network.go b/pkg/test/dockerutil/network.go index 511e4b4c75..798a106e41 100644 --- a/pkg/test/dockerutil/network.go +++ b/pkg/test/dockerutil/network.go @@ -19,7 +19,7 @@ import ( "net" "github.com/docker/docker/api/types/network" - "github.com/moby/moby/client" + "github.com/docker/docker/client" "gvisor.dev/gvisor/pkg/test/testutil" ) diff --git a/test/benchmarks/base/usage_test.go b/test/benchmarks/base/usage_test.go index abbae7d9c8..3907ef8d91 100644 --- a/test/benchmarks/base/usage_test.go +++ b/test/benchmarks/base/usage_test.go @@ -63,7 +63,7 @@ func BenchmarkSizeEmpty(b *testing.B) { if err := validateStats(stats); err != nil { b.Fatalf("failed to validate container stats: %v", err) } - sumMemoryUsage += stats.Stats.MemoryStats.Usage + sumMemoryUsage += stats.MemoryStats.Usage } reportMemoryUsage(b, sumMemoryUsage) } @@ -106,7 +106,7 @@ func BenchmarkSizeNginx(b *testing.B) { if err := validateStats(stats); err != nil { b.Fatalf("failed to validate container stats: %v", err) } - sumMemoryUsage += stats.Stats.MemoryStats.Usage + sumMemoryUsage += stats.MemoryStats.Usage } reportMemoryUsage(b, sumMemoryUsage) } @@ -156,7 +156,7 @@ func BenchmarkSizeNode(b *testing.B) { if err := validateStats(stats); err != nil { b.Fatalf("failed to validate container stats: %v", err) } - sumMemoryUsage += stats.Stats.MemoryStats.Usage + sumMemoryUsage += stats.MemoryStats.Usage } reportMemoryUsage(b, sumMemoryUsage) }