Merge pull request #16180 from HuKeping/graph

We don't need image layer stream when create the rootfs
Upstream-commit: 58ae808d426d1ad524b9088b02c9f4df951a10d8
Component: engine
This commit is contained in:
Brian Goff
2015-09-09 10:16:31 -04:00
+2 -2
View File
@@ -270,7 +270,7 @@ func (graph *Graph) Register(img *image.Image, layerData io.Reader) (err error)
}
// Create root filesystem in the driver
if err := createRootFilesystemInDriver(graph, img, layerData); err != nil {
if err := createRootFilesystemInDriver(graph, img); err != nil {
return err
}
@@ -286,7 +286,7 @@ func (graph *Graph) Register(img *image.Image, layerData io.Reader) (err error)
return nil
}
func createRootFilesystemInDriver(graph *Graph, img *image.Image, layerData io.Reader) error {
func createRootFilesystemInDriver(graph *Graph, img *image.Image) error {
if err := graph.driver.Create(img.ID, img.Parent); err != nil {
return fmt.Errorf("Driver %s failed to create image rootfs %s: %s", graph.driver, img.ID, err)
}