Merge pull request #12305 from runcom/remove-job-exec-inspect
Remove job from execInspect
This commit is contained in:
commit
a54fd325e6
|
@ -1157,9 +1157,14 @@ func getExecByID(eng *engine.Engine, version version.Version, w http.ResponseWri
|
||||||
if vars == nil {
|
if vars == nil {
|
||||||
return fmt.Errorf("Missing parameter 'id'")
|
return fmt.Errorf("Missing parameter 'id'")
|
||||||
}
|
}
|
||||||
var job = eng.Job("execInspect", vars["id"])
|
|
||||||
streamJSON(job, w, false)
|
d := getDaemon(eng)
|
||||||
return job.Run()
|
eConfig, err := d.ContainerExecInspect(vars["id"])
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return writeJSON(w, http.StatusOK, eConfig)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getImagesByName(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
|
func getImagesByName(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
|
||||||
|
|
|
@ -128,7 +128,6 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
|
||||||
"start": daemon.ContainerStart,
|
"start": daemon.ContainerStart,
|
||||||
"execCreate": daemon.ContainerExecCreate,
|
"execCreate": daemon.ContainerExecCreate,
|
||||||
"execStart": daemon.ContainerExecStart,
|
"execStart": daemon.ContainerExecStart,
|
||||||
"execInspect": daemon.ContainerExecInspect,
|
|
||||||
} {
|
} {
|
||||||
if err := eng.Register(name, method); err != nil {
|
if err := eng.Register(name, method); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -80,20 +80,11 @@ func (daemon *Daemon) ContainerInspect(job *engine.Job) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (daemon *Daemon) ContainerExecInspect(job *engine.Job) error {
|
func (daemon *Daemon) ContainerExecInspect(id string) (*execConfig, error) {
|
||||||
if len(job.Args) != 1 {
|
|
||||||
return fmt.Errorf("usage: %s ID", job.Name)
|
|
||||||
}
|
|
||||||
id := job.Args[0]
|
|
||||||
eConfig, err := daemon.getExecConfig(id)
|
eConfig, err := daemon.getExecConfig(id)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
b, err := json.Marshal(*eConfig)
|
return eConfig, nil
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
job.Stdout.Write(b)
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue