toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Docker-DCO-1.1-Signed-off-by: Nolan Darilek <nolan@thewordnerd.info> (github: ndarilek)
Upstream-commit: 937ea1d3805771b0e5763f336f9d64e5996c2c95
Component: engine
This commit is contained in:
Nolan Darilek
2014-02-20 11:18:27 -06:00
parent 4b28a0d43e
commit 1124129b25
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/volumes.go
+3 -3
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
}