starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-09 10:05:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation

Browse Source 
refactor: separate graph from image
Upstream-commit: 00b8fec75f3a113c851013e0f0d559cc6d96b84d
Component: engine
This commit is contained in:
Arnaud Porterie
2015-06-11 17:44:37 -07:00
parent b25a623fe3 c2f09cc42b
commit 3e78e2ecb7
11 changed files with 273 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/create.go
+1 -1
View File
@@ -63,7 +63,7 @@ func (daemon *Daemon) Create(config *runconfig.Config, hostConfig *runconfig.Hos
if err != nil {
return nil, nil, err
}
if err = img.CheckDepth(); err != nil {
if err = daemon.graph.CheckDepth(img); err != nil {
return nil, nil, err
}
imgID = img.ID
components/engine/daemon/image_delete.go
+1 -1
View File
@@ -160,7 +160,7 @@ func (daemon *Daemon) canDeleteImage(imgID string, force bool) error {
return err
}
if err := parent.WalkHistory(func(p *image.Image) error {
if err := daemon.graph.WalkHistory(parent, func(p image.Image) error {
if imgID == p.ID {
if container.IsRunning() {
if force {