Skip to content

Commit 03ff54b

Browse files
authored
Merge pull request docker#6193 from thaJeztah/bump_engine
vendor: github.com/docker/docker master (v29.0-dev)
2 parents 2a2748a + 644dc16 commit 03ff54b

File tree

556 files changed

+1423
-15053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

556 files changed

+1423
-15053
lines changed

cli-plugins/plugin/plugin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/docker/cli/cli/command"
1515
"github.com/docker/cli/cli/connhelper"
1616
"github.com/docker/cli/cli/debug"
17-
"github.com/docker/docker/client"
17+
"github.com/moby/moby/client"
1818
"github.com/spf13/cobra"
1919
"go.opentelemetry.io/otel"
2020
)

cli/command/builder/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package builder
33
import (
44
"context"
55

6-
"github.com/docker/docker/api/types/build"
7-
"github.com/docker/docker/client"
6+
"github.com/moby/moby/api/types/build"
7+
"github.com/moby/moby/client"
88
)
99

1010
type fakeClient struct {

cli/command/builder/prune.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/docker/cli/cli/command/completion"
1212
"github.com/docker/cli/internal/prompt"
1313
"github.com/docker/cli/opts"
14-
"github.com/docker/docker/api/types/build"
1514
"github.com/docker/go-units"
15+
"github.com/moby/moby/api/types/build"
1616
"github.com/spf13/cobra"
1717
)
1818

cli/command/builder/prune_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/docker/cli/internal/test"
10-
"github.com/docker/docker/api/types/build"
10+
"github.com/moby/moby/api/types/build"
1111
)
1212

1313
func TestBuilderPromptTermination(t *testing.T) {

cli/command/checkpoint/client_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package checkpoint
33
import (
44
"context"
55

6-
"github.com/docker/docker/api/types/checkpoint"
7-
"github.com/docker/docker/client"
6+
"github.com/moby/moby/api/types/checkpoint"
7+
"github.com/moby/moby/client"
88
)
99

1010
type fakeClient struct {

cli/command/checkpoint/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/docker/cli/cli"
88
"github.com/docker/cli/cli/command"
99
"github.com/docker/cli/cli/command/completion"
10-
"github.com/docker/docker/api/types/checkpoint"
10+
"github.com/moby/moby/api/types/checkpoint"
1111
"github.com/spf13/cobra"
1212
)
1313

cli/command/checkpoint/create_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"testing"
99

1010
"github.com/docker/cli/internal/test"
11-
"github.com/docker/docker/api/types/checkpoint"
11+
"github.com/moby/moby/api/types/checkpoint"
1212
"gotest.tools/v3/assert"
1313
is "gotest.tools/v3/assert/cmp"
1414
)

cli/command/checkpoint/formatter.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package checkpoint
22

33
import (
44
"github.com/docker/cli/cli/command/formatter"
5-
"github.com/docker/docker/api/types/checkpoint"
5+
"github.com/moby/moby/api/types/checkpoint"
66
)
77

88
const (

cli/command/checkpoint/formatter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66

77
"github.com/docker/cli/cli/command/formatter"
8-
"github.com/docker/docker/api/types/checkpoint"
8+
"github.com/moby/moby/api/types/checkpoint"
99
"gotest.tools/v3/assert"
1010
)
1111

cli/command/checkpoint/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/docker/cli/cli/command"
88
"github.com/docker/cli/cli/command/completion"
99
"github.com/docker/cli/cli/command/formatter"
10-
"github.com/docker/docker/api/types/checkpoint"
10+
"github.com/moby/moby/api/types/checkpoint"
1111
"github.com/spf13/cobra"
1212
)
1313

0 commit comments

Comments
 (0)