소스 검색

Merge pull request #32881 from coolljt0725/fix_exec_faild

Enable inspect exec if container is pause/restarting/non-running
Sebastiaan van Stijn 8 년 전
부모
커밋
53a75ee050
1개의 변경된 파일7개의 추가작업 그리고 3개의 파일을 삭제
  1. 7 3
      daemon/inspect.go

+ 7 - 3
daemon/inspect.go

@@ -197,9 +197,13 @@ func (daemon *Daemon) getInspectData(container *container.Container) (*types.Con
 // ContainerExecInspect returns low-level information about the exec
 // ContainerExecInspect returns low-level information about the exec
 // command. An error is returned if the exec cannot be found.
 // command. An error is returned if the exec cannot be found.
 func (daemon *Daemon) ContainerExecInspect(id string) (*backend.ExecInspect, error) {
 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)
 	pc := inspectExecProcessConfig(e)