remove job from load

Signed-off-by: Simei He <hesimei@zju.edu.cn>

Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 70bb0d8ed7847d7e7850a1a864ff258767f0ad7a
Component: engine
This commit is contained in:
Simei He
2015-04-23 19:13:12 +08:00
committed by He Simei
parent 4ea8bd7fe7
commit ece94d0722
3 changed files with 19 additions and 9 deletions
+8 -4
View File
@@ -900,10 +900,14 @@ func (s *Server) getImagesGet(eng *engine.Engine, version version.Version, w htt
}
func (s *Server) postImagesLoad(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
job := eng.Job("load")
job.Stdin.Add(r.Body)
job.Stdout.Add(w)
return job.Run()
imageLoadConfig := &graph.ImageLoadConfig{
InTar: r.Body,
OutStream: w,
Engine: eng,
}
return s.daemon.Repositories().Load(imageLoadConfig)
}
func (s *Server) postContainersCreate(eng *engine.Engine, version version.Version, w http.ResponseWriter, r *http.Request, vars map[string]string) error {