p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32881 from coolljt0725/fix_exec_faild

Browse Source 
Enable inspect exec if container is pause/restarting/non-running
Upstream-commit: 53a75ee05072cf5e59e9fb5b9e5cc5fb91fdb5be
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-07-12 19:29:27 -07:00
committed by GitHub
parent 2015772003 6dce6bba77
commit f68d310a1b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/engine/daemon/inspect.go
View File

@ -197,9 +197,13 @@ func (daemon *Daemon) getInspectData(container *container.Container) (*types.Con
// ContainerExecInspect returns low-level information about the exec
// command. An error is returned if the exec cannot be found.
func (daemon *Daemon) ContainerExecInspect(id string) (*backend.ExecInspect, error) {
e, err := daemon.getExecConfig(id)
if err != nil {
return nil, err
e := daemon.execCommands.Get(id)
if e == nil {
return nil, errExecNotFound(id)
}
if container := daemon.containers.Get(e.ContainerID); container == nil {
return nil, errExecNotFound(id)
}
pc := inspectExecProcessConfig(e)