beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #40475 from cpuguy83/fix_client_exec_type_id

Browse source 
Exec inspect field should be "ID" not "ExecID"
This commit is contained in:
Akihiro Suda 2020-02-26 19:11:33 +09:00 committed by GitHub
commit 26e6708ccf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/types/client.go
View file

@ -50,7 +50,7 @@ type ContainerCommitOptions struct {
// ContainerExecInspect holds information returned by exec inspect. // ContainerExecInspect holds information returned by exec inspect.
type ContainerExecInspect struct { type ContainerExecInspect struct {
ExecID string ExecID string `json:"ID"`
ContainerID string ContainerID string
Running bool Running bool
ExitCode int ExitCode int

4
integration/container/exec_test.go
View file

@ -102,6 +102,10 @@ func TestExec(t *testing.T) {
) )
assert.NilError(t, err) assert.NilError(t, err)
inspect, err := client.ContainerExecInspect(ctx, id.ID)
assert.NilError(t, err)
assert.Check(t, is.Equal(inspect.ExecID, id.ID))
resp, err := client.ContainerExecAttach(ctx, id.ID, resp, err := client.ContainerExecAttach(ctx, id.ID,
types.ExecStartCheck{ types.ExecStartCheck{
Detach: false, Detach: false,