Skip to content

Commit 93bb8a7

Browse files
vvolandvvoland
authored
Merge pull request #6458 from thaJeztah/bump_engine
vendor: github.com/moby/moby/api, github.com/moby/moby/client master
2 parents b1d4528 + c5cbb3e commit 93bb8a7

59 files changed

Lines changed: 292 additions & 464 deletions

Some content is hidden

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

‎cli/command/container/client_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
type fakeClient struct {
1616
client.Client
1717
inspectFunc func(string) (container.InspectResponse, error)
18-
execInspectFunc func(execID string) (container.ExecInspect, error)
19-
execCreateFunc func(containerID string, options container.ExecOptions) (container.ExecCreateResponse, error)
18+
execInspectFunc func(execID string) (client.ExecInspect, error)
19+
execCreateFunc func(containerID string, options client.ExecCreateOptions) (container.ExecCreateResponse, error)
2020
createContainerFunc func(config *container.Config,
2121
hostConfig *container.HostConfig,
2222
networkingConfig *network.NetworkingConfig,
@@ -59,21 +59,21 @@ func (f *fakeClient) ContainerInspect(_ context.Context, containerID string) (co
5959
return container.InspectResponse{}, nil
6060
}
6161

62-
func (f *fakeClient) ContainerExecCreate(_ context.Context, containerID string, config container.ExecOptions) (container.ExecCreateResponse, error) {
62+
func (f *fakeClient) ContainerExecCreate(_ context.Context, containerID string, config client.ExecCreateOptions) (container.ExecCreateResponse, error) {
6363
if f.execCreateFunc != nil {
6464
return f.execCreateFunc(containerID, config)
6565
}
6666
return container.ExecCreateResponse{}, nil
6767
}
6868

69-
func (f *fakeClient) ContainerExecInspect(_ context.Context, execID string) (container.ExecInspect, error) {
69+
func (f *fakeClient) ContainerExecInspect(_ context.Context, execID string) (client.ExecInspect, error) {
7070
if f.execInspectFunc != nil {
7171
return f.execInspectFunc(execID)
7272
}
73-
return container.ExecInspect{}, nil
73+
return client.ExecInspect{}, nil
7474
}
7575

76-
func (*fakeClient) ContainerExecStart(context.Context, string, container.ExecStartOptions) error {
76+
func (*fakeClient) ContainerExecStart(context.Context, string, client.ExecStartOptions) error {
7777
return nil
7878
}
7979

‎cli/command/container/commit.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func runCommit(ctx context.Context, dockerCli command.Cli, options *commitOption
7575
Comment: options.comment,
7676
Author: options.author,
7777
Changes: options.changes.GetSlice(),
78-
Pause: !options.noPause,
78+
NoPause: options.noPause,
7979
})
8080
if err != nil {
8181
return err

‎cli/command/container/commit_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestRunCommit(t *testing.T) {
2323
assert.Check(t, is.Equal(options.Author, "Author Name <author@name.com>"))
2424
assert.Check(t, is.DeepEqual(options.Changes, []string{"EXPOSE 80"}))
2525
assert.Check(t, is.Equal(options.Comment, "commit message"))
26-
assert.Check(t, is.Equal(options.Pause, false))
26+
assert.Check(t, is.Equal(options.NoPause, true))
2727
assert.Check(t, is.Equal(ctr, "container-id"))
2828

2929
return container.CommitResponse{ID: "image-id"}, nil

‎cli/command/container/exec.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func RunExec(ctx context.Context, dockerCLI command.Cli, containerIDorName strin
119119
}
120120

121121
if options.Detach {
122-
return apiClient.ContainerExecStart(ctx, execID, container.ExecStartOptions{
122+
return apiClient.ContainerExecStart(ctx, execID, client.ExecStartOptions{
123123
Detach: options.Detach,
124124
Tty: execOptions.Tty,
125125
ConsoleSize: execOptions.ConsoleSize,
@@ -128,14 +128,14 @@ func RunExec(ctx context.Context, dockerCLI command.Cli, containerIDorName strin
128128
return interactiveExec(ctx, dockerCLI, execOptions, execID)
129129
}
130130

131-
func fillConsoleSize(execOptions *container.ExecOptions, dockerCli command.Cli) {
131+
func fillConsoleSize(execOptions *client.ExecCreateOptions, dockerCli command.Cli) {
132132
if execOptions.Tty {
133133
height, width := dockerCli.Out().GetTtySize()
134134
execOptions.ConsoleSize = &[2]uint{height, width}
135135
}
136136
}
137137

138-
func interactiveExec(ctx context.Context, dockerCli command.Cli, execOptions *container.ExecOptions, execID string) error {
138+
func interactiveExec(ctx context.Context, dockerCli command.Cli, execOptions *client.ExecCreateOptions, execID string) error {
139139
// Interactive exec requested.
140140
var (
141141
out, stderr io.Writer
@@ -158,7 +158,7 @@ func interactiveExec(ctx context.Context, dockerCli command.Cli, execOptions *co
158158
fillConsoleSize(execOptions, dockerCli)
159159

160160
apiClient := dockerCli.Client()
161-
resp, err := apiClient.ContainerExecAttach(ctx, execID, container.ExecAttachOptions{
161+
resp, err := apiClient.ContainerExecAttach(ctx, execID, client.ExecAttachOptions{
162162
Tty: execOptions.Tty,
163163
ConsoleSize: execOptions.ConsoleSize,
164164
})
@@ -218,8 +218,8 @@ func getExecExitStatus(ctx context.Context, apiClient client.ContainerAPIClient,
218218

219219
// parseExec parses the specified args for the specified command and generates
220220
// an ExecConfig from it.
221-
func parseExec(execOpts ExecOptions, configFile *configfile.ConfigFile) (*container.ExecOptions, error) {
222-
execOptions := &container.ExecOptions{
221+
func parseExec(execOpts ExecOptions, configFile *configfile.ConfigFile) (*client.ExecCreateOptions, error) {
222+
execOptions := &client.ExecCreateOptions{
223223
User: execOpts.User,
224224
Privileged: execOpts.Privileged,
225225
Tty: execOpts.TTY,

‎cli/command/container/exec_test.go‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/docker/cli/internal/test"
1414
"github.com/docker/cli/opts"
1515
"github.com/moby/moby/api/types/container"
16+
"github.com/moby/moby/client"
1617
"gotest.tools/v3/assert"
1718
is "gotest.tools/v3/assert/cmp"
1819
"gotest.tools/v3/fs"
@@ -38,18 +39,18 @@ TWO=2
3839
testcases := []struct {
3940
options ExecOptions
4041
configFile configfile.ConfigFile
41-
expected container.ExecOptions
42+
expected client.ExecCreateOptions
4243
}{
4344
{
44-
expected: container.ExecOptions{
45+
expected: client.ExecCreateOptions{
4546
Cmd: []string{"command"},
4647
AttachStdout: true,
4748
AttachStderr: true,
4849
},
4950
options: withDefaultOpts(ExecOptions{}),
5051
},
5152
{
52-
expected: container.ExecOptions{
53+
expected: client.ExecCreateOptions{
5354
Cmd: []string{"command1", "command2"},
5455
AttachStdout: true,
5556
AttachStderr: true,
@@ -64,7 +65,7 @@ TWO=2
6465
TTY: true,
6566
User: "uid",
6667
}),
67-
expected: container.ExecOptions{
68+
expected: client.ExecCreateOptions{
6869
User: "uid",
6970
AttachStdin: true,
7071
AttachStdout: true,
@@ -75,7 +76,7 @@ TWO=2
7576
},
7677
{
7778
options: withDefaultOpts(ExecOptions{Detach: true}),
78-
expected: container.ExecOptions{
79+
expected: client.ExecCreateOptions{
7980
Cmd: []string{"command"},
8081
},
8182
},
@@ -85,15 +86,15 @@ TWO=2
8586
Interactive: true,
8687
Detach: true,
8788
}),
88-
expected: container.ExecOptions{
89+
expected: client.ExecCreateOptions{
8990
Tty: true,
9091
Cmd: []string{"command"},
9192
},
9293
},
9394
{
9495
options: withDefaultOpts(ExecOptions{Detach: true}),
9596
configFile: configfile.ConfigFile{DetachKeys: "de"},
96-
expected: container.ExecOptions{
97+
expected: client.ExecCreateOptions{
9798
Cmd: []string{"command"},
9899
DetachKeys: "de",
99100
},
@@ -104,13 +105,13 @@ TWO=2
104105
DetachKeys: "ab",
105106
}),
106107
configFile: configfile.ConfigFile{DetachKeys: "de"},
107-
expected: container.ExecOptions{
108+
expected: client.ExecCreateOptions{
108109
Cmd: []string{"command"},
109110
DetachKeys: "ab",
110111
},
111112
},
112113
{
113-
expected: container.ExecOptions{
114+
expected: client.ExecCreateOptions{
114115
Cmd: []string{"command"},
115116
AttachStdout: true,
116117
AttachStderr: true,
@@ -123,7 +124,7 @@ TWO=2
123124
}(),
124125
},
125126
{
126-
expected: container.ExecOptions{
127+
expected: client.ExecCreateOptions{
127128
Cmd: []string{"command"},
128129
AttachStdout: true,
129130
AttachStderr: true,
@@ -206,7 +207,7 @@ func TestRunExec(t *testing.T) {
206207
}
207208
}
208209

209-
func execCreateWithID(_ string, _ container.ExecOptions) (container.ExecCreateResponse, error) {
210+
func execCreateWithID(_ string, _ client.ExecCreateOptions) (container.ExecCreateResponse, error) {
210211
return container.ExecCreateResponse{ID: "execid"}, nil
211212
}
212213

@@ -235,9 +236,9 @@ func TestGetExecExitStatus(t *testing.T) {
235236

236237
for _, testcase := range testcases {
237238
apiClient := &fakeClient{
238-
execInspectFunc: func(id string) (container.ExecInspect, error) {
239+
execInspectFunc: func(id string) (client.ExecInspect, error) {
239240
assert.Check(t, is.Equal(execID, id))
240-
return container.ExecInspect{ExitCode: testcase.exitCode}, testcase.inspectError
241+
return client.ExecInspect{ExitCode: testcase.exitCode}, testcase.inspectError
241242
},
242243
}
243244
err := getExecExitStatus(context.Background(), apiClient, execID)

‎vendor.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ require (
2828
github.com/google/uuid v1.6.0
2929
github.com/mattn/go-runewidth v0.0.16
3030
github.com/moby/go-archive v0.1.0
31-
github.com/moby/moby/api v1.52.0-beta.1
32-
github.com/moby/moby/client v0.1.0-beta.0
31+
github.com/moby/moby/api v1.52.0-beta.1.0.20250923190348-e98849831fc4 // master
32+
github.com/moby/moby/client v0.1.0-beta.0.0.20250923190348-e98849831fc4 // master
3333
github.com/moby/patternmatcher v0.6.0
3434
github.com/moby/swarmkit/v2 v2.0.0
3535
github.com/moby/sys/atomicwriter v0.1.0

‎vendor.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,10 @@ github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3N
170170
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
171171
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
172172
github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
173-
github.com/moby/moby/api v1.52.0-beta.1 h1:r5U4U72E7xSHh4zX72ndY1mA/FOGiAPiGiz2a8rBW+w=
174-
github.com/moby/moby/api v1.52.0-beta.1/go.mod h1:8sBV0soUREiudtow4vqJGOxa4GyHI5vLQmvgKdHq5Ok=
175-
github.com/moby/moby/client v0.1.0-beta.0 h1:eXzrwi0YkzLvezOBKHafvAWNmH1B9HFh4n13yb2QgFE=
176-
github.com/moby/moby/client v0.1.0-beta.0/go.mod h1:irAv8jRi4yKKBeND96Y+3AM9ers+KaJYk9Vmcm7loxs=
173+
github.com/moby/moby/api v1.52.0-beta.1.0.20250923190348-e98849831fc4 h1:nwVKjkAlQJp32lsr/TZ4dGUIkj+Ga6ftle+IVov9HYs=
174+
github.com/moby/moby/api v1.52.0-beta.1.0.20250923190348-e98849831fc4/go.mod h1:8sBV0soUREiudtow4vqJGOxa4GyHI5vLQmvgKdHq5Ok=
175+
github.com/moby/moby/client v0.1.0-beta.0.0.20250923190348-e98849831fc4 h1:fk0TcJJf4rrgD3I35xxPkb9R4S+KCToMNomydm/n2Pg=
176+
github.com/moby/moby/client v0.1.0-beta.0.0.20250923190348-e98849831fc4/go.mod h1:o5CkJu0RlmnLWRZRaEd7fL6wo0Ggr8Hw/UvgqdIUBuI=
177177
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
178178
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
179179
github.com/moby/swarmkit/v2 v2.0.0 h1:jkWQKQaJ4ltA61/mC9UdPe1McLma55RUcacTO+pPweY=

‎vendor/github.com/moby/moby/api/types/container/exec.go‎

Lines changed: 0 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/moby/moby/api/types/container/exec_create_request.go‎

Lines changed: 17 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/moby/moby/api/types/container/exec_start_request.go‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)