kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Don't call applyVolumesFrom on containers with volumes already configured (closes #2973) 

Docker-DCO-1.1-Signed-off-by: Nolan Darilek <nolan@thewordnerd.info> (github: ndarilek)
This commit is contained in:
Nolan Darilek 2014-02-20 11:18:27 -06:00
parent ea0cce6270
commit 937ea1d380
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
volumes.go
View File

@ -23,11 +23,11 @@ func prepareVolumesForContainer(container *Container) error {
if container.Volumes == nil || len(container.Volumes) == 0 {
container.Volumes = make(map[string]string)
container.VolumesRW = make(map[string]bool)
if err := applyVolumesFrom(container); err != nil {
return err
}
}
if err := applyVolumesFrom(container); err != nil {
return err
}
if err := createVolumes(container); err != nil {
return err
}