Skip to content

Commit 5a4a4e3

Browse files
avagingvisor-bot
authored andcommitted
Internal change
PiperOrigin-RevId: 758396185
1 parent 5d72669 commit 5a4a4e3

File tree

6 files changed

+11
-18
lines changed

6 files changed

+11
-18
lines changed

WORKSPACE

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2800,18 +2800,11 @@ go_repository(
28002800
version = "v1.3.1",
28012801
)
28022802

2803-
go_repository(
2804-
name = "com_github_moby_moby",
2805-
importpath = "github.com/moby/moby",
2806-
sum = "h1:AhSu/R7C5uiyd+JCts3kxrKyTzXa3FilBJ0KCLUHXqA=",
2807-
version = "v27.3.0+incompatible",
2808-
)
2809-
28102803
go_repository(
28112804
name = "com_github_docker_docker",
28122805
importpath = "github.com/docker/docker",
2813-
sum = "h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A=",
2814-
version = "v27.3.0+incompatible",
2806+
sum = "h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=",
2807+
version = "v28.1.1+incompatible",
28152808
)
28162809

28172810
go_repository(

pkg/test/dockerutil/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ go_library(
4141
"@com_github_docker_docker//api/types/container:go_default_library",
4242
"@com_github_docker_docker//api/types/mount:go_default_library",
4343
"@com_github_docker_docker//api/types/network:go_default_library",
44+
"@com_github_docker_docker//client:go_default_library",
45+
"@com_github_docker_docker//pkg/stdcopy:go_default_library",
4446
"@com_github_docker_go_connections//nat:go_default_library",
45-
"@com_github_moby_moby//client:go_default_library",
46-
"@com_github_moby_moby//pkg/stdcopy:go_default_library",
4747
"@org_golang_x_sys//unix:go_default_library",
4848
],
4949
)

pkg/test/dockerutil/container.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import (
3636
"github.com/docker/docker/api/types/container"
3737
"github.com/docker/docker/api/types/mount"
3838
"github.com/docker/docker/api/types/network"
39+
"github.com/docker/docker/client"
40+
"github.com/docker/docker/pkg/stdcopy"
3941
"github.com/docker/go-connections/nat"
40-
"github.com/moby/moby/client"
41-
"github.com/moby/moby/pkg/stdcopy"
4242
"gvisor.dev/gvisor/pkg/sync"
4343
"gvisor.dev/gvisor/pkg/test/testutil"
4444
)

pkg/test/dockerutil/exec.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/docker/docker/api/types"
2424
"github.com/docker/docker/api/types/container"
25-
"github.com/moby/moby/pkg/stdcopy"
25+
"github.com/docker/docker/pkg/stdcopy"
2626
)
2727

2828
// ExecOpts holds arguments for Exec calls.

pkg/test/dockerutil/network.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"net"
2020

2121
"github.com/docker/docker/api/types/network"
22-
"github.com/moby/moby/client"
22+
"github.com/docker/docker/client"
2323
"gvisor.dev/gvisor/pkg/test/testutil"
2424
)
2525

test/benchmarks/base/usage_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func BenchmarkSizeEmpty(b *testing.B) {
6363
if err := validateStats(stats); err != nil {
6464
b.Fatalf("failed to validate container stats: %v", err)
6565
}
66-
sumMemoryUsage += stats.Stats.MemoryStats.Usage
66+
sumMemoryUsage += stats.MemoryStats.Usage
6767
}
6868
reportMemoryUsage(b, sumMemoryUsage)
6969
}
@@ -106,7 +106,7 @@ func BenchmarkSizeNginx(b *testing.B) {
106106
if err := validateStats(stats); err != nil {
107107
b.Fatalf("failed to validate container stats: %v", err)
108108
}
109-
sumMemoryUsage += stats.Stats.MemoryStats.Usage
109+
sumMemoryUsage += stats.MemoryStats.Usage
110110
}
111111
reportMemoryUsage(b, sumMemoryUsage)
112112
}
@@ -156,7 +156,7 @@ func BenchmarkSizeNode(b *testing.B) {
156156
if err := validateStats(stats); err != nil {
157157
b.Fatalf("failed to validate container stats: %v", err)
158158
}
159-
sumMemoryUsage += stats.Stats.MemoryStats.Usage
159+
sumMemoryUsage += stats.MemoryStats.Usage
160160
}
161161
reportMemoryUsage(b, sumMemoryUsage)
162162
}

0 commit comments

Comments
 (0)