clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-08 06:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split volumes out from daemon

Browse Source 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
This commit is contained in:
Brian Goff
2014-09-19 17:47:47 -05:00
parent ba726d9148
commit 45407cf00a
12 changed files with 537 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/internals.go
+4 -3
View File
@@ -618,9 +618,10 @@ func (b *Builder) clearTmp() {
tmp := b.Daemon.Get(c)
if err := b.Daemon.Destroy(tmp); err != nil {
fmt.Fprintf(b.OutStream, "Error removing intermediate container %s: %s\n", utils.TruncateID(c), err.Error())
} else {
delete(b.TmpContainers, c)
fmt.Fprintf(b.OutStream, "Removing intermediate container %s\n", utils.TruncateID(c))
return
}
b.Daemon.DeleteVolumes(tmp.VolumePaths())
delete(b.TmpContainers, c)
fmt.Fprintf(b.OutStream, "Removing intermediate container %s\n", utils.TruncateID(c))
}
}