kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

skip the volumes mounted when deleting the volumes of container.

Browse source
This commit is contained in:
Liang-Chi Hsieh 2013-10-31 23:49:30 +08:00
parent 3885ef585b
commit 6a693176d6
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server.go
View file

@ -1104,8 +1104,12 @@ func (srv *Server) ContainerDestroy(name string, removeVolume, removeLink bool)
volumes := make(map[string]struct{}) volumes := make(map[string]struct{})
// Store all the deleted containers volumes // Store all the deleted containers volumes
for _, volumeId := range container.Volumes { for _, volumeId := range container.Volumes {
volumeId = strings.TrimRight(volumeId, "/layer") trim_volumeId := strings.TrimSuffix(volumeId, "/layer")
volumeId = filepath.Base(volumeId) // Skip the volumes mounted
if trim_volumeId == volumeId {
continue
}
volumeId = filepath.Base(trim_volumeId)
volumes[volumeId] = struct{}{} volumes[volumeId] = struct{}{}
} }
if err := srv.runtime.Destroy(container); err != nil { if err := srv.runtime.Destroy(container); err != nil {