From 937ea1d3805771b0e5763f336f9d64e5996c2c95 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Thu, 20 Feb 2014 11:18:27 -0600 Subject: [PATCH] Don't call applyVolumesFrom on containers with volumes already configured (closes #2973) Docker-DCO-1.1-Signed-off-by: Nolan Darilek (github: ndarilek) --- volumes.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/volumes.go b/volumes.go index a53ef722e7..9f76e3698b 100644 --- a/volumes.go +++ b/volumes.go @@ -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 }