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

Merge pull request #4264 from ndarilek/2973-skip-volumes-from

Browse Source 
Don't call applyVolumesFrom on containers with volumes already configure...
Upstream-commit: 1ad14effb507589b84e5f93e7682c8e45ec10c28
Component: engine
This commit is contained in:
Guillaume J. Charmes
2014-03-05 15:44:15 -08:00
parent 6e470bbbd0 1124129b25
commit eb76d6728d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/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
}