Skip to content

Commit f32fa68

Browse files
avagingvisor-bot
avagin
authored and
gvisor-bot
committed
Internal change
PiperOrigin-RevId: 758396185
1 parent 5d72669 commit f32fa68

23 files changed

+40
-47
lines changed

‎WORKSPACE

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2803,15 +2803,8 @@ go_repository(
28032803
go_repository(
28042804
name = "com_github_moby_moby",
28052805
importpath = "github.com/moby/moby",
2806-
sum = "h1:AhSu/R7C5uiyd+JCts3kxrKyTzXa3FilBJ0KCLUHXqA=",
2807-
version = "v27.3.0+incompatible",
2808-
)
2809-
2810-
go_repository(
2811-
name = "com_github_docker_docker",
2812-
importpath = "github.com/docker/docker",
2813-
sum = "h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A=",
2814-
version = "v27.3.0+incompatible",
2806+
sum = "h1:lyEaGTiUhIdXRUv/vPamckAbPt5LcPQkeHmwAHN98eQ=",
2807+
version = "v28.1.1+incompatible",
28152808
)
28162809

28172810
go_repository(

‎pkg/test/dockerutil/BUILD

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ go_library(
3636
"//pkg/sync",
3737
"//pkg/test/testutil",
3838
"//runsc/cgroup",
39-
"@com_github_docker_docker//api/types:go_default_library",
40-
"@com_github_docker_docker//api/types/checkpoint:go_default_library",
41-
"@com_github_docker_docker//api/types/container:go_default_library",
42-
"@com_github_docker_docker//api/types/mount:go_default_library",
43-
"@com_github_docker_docker//api/types/network:go_default_library",
4439
"@com_github_docker_go_connections//nat:go_default_library",
40+
"@com_github_moby_moby//api/types:go_default_library",
41+
"@com_github_moby_moby//api/types/checkpoint:go_default_library",
42+
"@com_github_moby_moby//api/types/container:go_default_library",
43+
"@com_github_moby_moby//api/types/mount:go_default_library",
44+
"@com_github_moby_moby//api/types/network:go_default_library",
4545
"@com_github_moby_moby//client:go_default_library",
4646
"@com_github_moby_moby//pkg/stdcopy:go_default_library",
4747
"@org_golang_x_sys//unix:go_default_library",

‎pkg/test/dockerutil/container.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import (
3131
"testing"
3232
"time"
3333

34-
"github.com/docker/docker/api/types"
35-
"github.com/docker/docker/api/types/checkpoint"
36-
"github.com/docker/docker/api/types/container"
37-
"github.com/docker/docker/api/types/mount"
38-
"github.com/docker/docker/api/types/network"
3934
"github.com/docker/go-connections/nat"
35+
"github.com/moby/moby/api/types"
36+
"github.com/moby/moby/api/types/checkpoint"
37+
"github.com/moby/moby/api/types/container"
38+
"github.com/moby/moby/api/types/mount"
39+
"github.com/moby/moby/api/types/network"
4040
"github.com/moby/moby/client"
4141
"github.com/moby/moby/pkg/stdcopy"
4242
"gvisor.dev/gvisor/pkg/sync"

‎pkg/test/dockerutil/exec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"fmt"
2121
"time"
2222

23-
"github.com/docker/docker/api/types"
24-
"github.com/docker/docker/api/types/container"
23+
"github.com/moby/moby/api/types"
24+
"github.com/moby/moby/api/types/container"
2525
"github.com/moby/moby/pkg/stdcopy"
2626
)
2727

‎pkg/test/dockerutil/gpu.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"strings"
2626
"testing"
2727

28-
"github.com/docker/docker/api/types/container"
29-
"github.com/docker/docker/api/types/mount"
28+
"github.com/moby/moby/api/types/container"
29+
"github.com/moby/moby/api/types/mount"
3030

3131
// Needed for go:embed
3232
_ "embed"

‎pkg/test/dockerutil/network.go

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

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

‎test/benchmarks/base/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,6 @@ benchmark_test(
9494
"//test/benchmarks/harness",
9595
"//test/benchmarks/tools",
9696
"//test/metricsviz",
97-
"@com_github_docker_docker//api/types/container:go_default_library",
97+
"@com_github_moby_moby//api/types/container:go_default_library",
9898
],
9999
)

‎test/benchmarks/base/usage_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"testing"
2222
"time"
2323

24-
"github.com/docker/docker/api/types/container"
24+
"github.com/moby/moby/api/types/container"
2525
"gvisor.dev/gvisor/pkg/test/dockerutil"
2626
"gvisor.dev/gvisor/test/benchmarks/base"
2727
"gvisor.dev/gvisor/test/benchmarks/harness"
@@ -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
}

‎test/benchmarks/fs/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ benchmark_test(
1616
"//test/benchmarks/fs/fsbench",
1717
"//test/benchmarks/harness",
1818
"//test/benchmarks/tools",
19-
"@com_github_docker_docker//api/types/mount:go_default_library",
19+
"@com_github_moby_moby//api/types/mount:go_default_library",
2020
],
2121
)
2222

@@ -32,7 +32,7 @@ benchmark_test(
3232
"//test/benchmarks/harness",
3333
"//test/benchmarks/tools",
3434
"//test/metricsviz",
35-
"@com_github_docker_docker//api/types/mount:go_default_library",
35+
"@com_github_moby_moby//api/types/mount:go_default_library",
3636
],
3737
)
3838

‎test/benchmarks/harness/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ go_library(
1818
"//pkg/cleanup",
1919
"//pkg/test/dockerutil",
2020
"//pkg/test/testutil",
21-
"@com_github_docker_docker//api/types/mount:go_default_library",
21+
"@com_github_moby_moby//api/types/mount:go_default_library",
2222
],
2323
)

‎test/benchmarks/harness/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"strings"
2121
"testing"
2222

23-
"github.com/docker/docker/api/types/mount"
23+
"github.com/moby/moby/api/types/mount"
2424
"gvisor.dev/gvisor/pkg/cleanup"
2525
"gvisor.dev/gvisor/pkg/test/dockerutil"
2626
"gvisor.dev/gvisor/pkg/test/testutil"

‎test/e2e/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ go_test(
2525
"//pkg/test/dockerutil",
2626
"//pkg/test/testutil",
2727
"//runsc/specutils",
28-
"@com_github_docker_docker//api/types/mount:go_default_library",
28+
"@com_github_moby_moby//api/types/mount:go_default_library",
2929
"@org_golang_x_sys//unix:go_default_library",
3030
],
3131
)
@@ -47,7 +47,7 @@ go_test(
4747
"//pkg/test/dockerutil",
4848
"//pkg/test/testutil",
4949
"//runsc/boot",
50-
"@com_github_docker_docker//api/types/mount:go_default_library",
50+
"@com_github_moby_moby//api/types/mount:go_default_library",
5151
"@org_golang_x_sys//unix:go_default_library",
5252
],
5353
)
@@ -68,7 +68,7 @@ go_test(
6868
deps = [
6969
"//pkg/test/dockerutil",
7070
"//pkg/test/testutil",
71-
"@com_github_docker_docker//api/types/mount:go_default_library",
71+
"@com_github_moby_moby//api/types/mount:go_default_library",
7272
],
7373
)
7474

‎test/e2e/integration_runtime_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import (
3434
"testing"
3535
"time"
3636

37-
"github.com/docker/docker/api/types/mount"
37+
"github.com/moby/moby/api/types/mount"
3838
"golang.org/x/sys/unix"
3939
"gvisor.dev/gvisor/pkg/test/dockerutil"
4040
"gvisor.dev/gvisor/pkg/test/testutil"

‎test/e2e/integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"testing"
3838
"time"
3939

40-
"github.com/docker/docker/api/types/mount"
40+
"github.com/moby/moby/api/types/mount"
4141
"golang.org/x/sys/unix"
4242
"gvisor.dev/gvisor/pkg/test/dockerutil"
4343
"gvisor.dev/gvisor/pkg/test/testutil"

‎test/e2e/runtime_in_docker_test.go

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

25-
"github.com/docker/docker/api/types/mount"
25+
"github.com/moby/moby/api/types/mount"
2626
"gvisor.dev/gvisor/pkg/test/dockerutil"
2727
"gvisor.dev/gvisor/pkg/test/testutil"
2828
)

‎test/fsstress/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ go_test(
2020
deps = [
2121
"//pkg/test/dockerutil",
2222
"//pkg/test/testutil",
23-
"@com_github_docker_docker//api/types/mount:go_default_library",
23+
"@com_github_moby_moby//api/types/mount:go_default_library",
2424
],
2525
)
2626

‎test/fsstress/fsstress_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626
"testing"
2727

28-
"github.com/docker/docker/api/types/mount"
28+
"github.com/moby/moby/api/types/mount"
2929
"gvisor.dev/gvisor/pkg/test/dockerutil"
3030
"gvisor.dev/gvisor/pkg/test/testutil"
3131
)

‎test/gpu/vllm/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ benchmark_test(
1414
"//test/benchmarks/harness",
1515
"//test/benchmarks/tools",
1616
"//test/metricsviz",
17-
"@com_github_docker_docker//api/types/mount:go_default_library",
17+
"@com_github_moby_moby//api/types/mount:go_default_library",
1818
],
1919
)

‎test/gpu/vllm/vllm_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"testing"
2727
"time"
2828

29-
"github.com/docker/docker/api/types/mount"
29+
"github.com/moby/moby/api/types/mount"
3030
"gvisor.dev/gvisor/pkg/test/dockerutil"
3131
"gvisor.dev/gvisor/test/benchmarks/harness"
3232
)

‎test/image/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ go_test(
2727
deps = [
2828
"//pkg/test/dockerutil",
2929
"//pkg/test/testutil",
30-
"@com_github_docker_docker//api/types/mount:go_default_library",
30+
"@com_github_moby_moby//api/types/mount:go_default_library",
3131
],
3232
)
3333

‎test/image/image_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"testing"
3434
"time"
3535

36-
"github.com/docker/docker/api/types/mount"
36+
"github.com/moby/moby/api/types/mount"
3737
"gvisor.dev/gvisor/pkg/test/dockerutil"
3838
"gvisor.dev/gvisor/pkg/test/testutil"
3939
)

‎test/metricsviz/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ go_library(
1616
deps = [
1717
"//pkg/metric",
1818
"//pkg/metric:metric_go_proto",
19-
"@com_github_docker_docker//api/types:go_default_library",
2019
"@com_github_go_echarts_go_echarts_v2//charts:go_default_library",
2120
"@com_github_go_echarts_go_echarts_v2//components:go_default_library",
2221
"@com_github_go_echarts_go_echarts_v2//opts:go_default_library",
2322
"@com_github_go_echarts_go_echarts_v2//types:go_default_library",
23+
"@com_github_moby_moby//api/types:go_default_library",
2424
"@org_golang_google_protobuf//encoding/protojson:go_default_library",
2525
],
2626
)

‎test/metricsviz/metricsviz.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import (
3232
"testing"
3333
"time"
3434

35-
"github.com/docker/docker/api/types"
3635
"github.com/go-echarts/go-echarts/v2/charts"
3736
"github.com/go-echarts/go-echarts/v2/components"
3837
"github.com/go-echarts/go-echarts/v2/opts"
3938
echartstypes "github.com/go-echarts/go-echarts/v2/types"
39+
"github.com/moby/moby/api/types"
4040
"google.golang.org/protobuf/encoding/protojson"
4141
"gvisor.dev/gvisor/pkg/metric"
4242
mpb "gvisor.dev/gvisor/pkg/metric/metric_go_proto"

0 commit comments

Comments
 (0)