skip the volumes mounted when deleting the volumes of container.

This commit is contained in:
Liang-Chi Hsieh 2013-10-31 23:49:30 +08:00
Родитель 3885ef585b
Коммит 6a693176d6
1 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

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