Merge pull request #384 from ndeloof/volumes_from_regression

fix regression considering volumes-from: container a dependency

Author: glours

loader/normalize.go

@@ -117,7 +117,7 @@ func Normalize(project *types.Project, resolvePaths bool) error {
 		}
 
 		for _, vol := range s.VolumesFrom {
-			if !strings.HasPrefix(s.Pid, types.ContainerPrefix) {
+			if !strings.HasPrefix(vol, types.ContainerPrefix) {
 				spec := strings.Split(vol, ":")
 				s.DependsOn = setIfMissing(s.DependsOn, spec[0], types.ServiceDependency{
 					Condition: types.ServiceConditionStarted,

loader/normalize_test.go

@@ -201,8 +201,11 @@ func TestNormalizeDependsOn(t *testing.T) {
 				NetworkMode: "service:zot",
 			},
 			{
-				Name:        "bar",
-				VolumesFrom: []string{"zot"},
+				Name: "bar",
+				VolumesFrom: []string{
+					"zot",
+					"container:xxx",
+				},
 			},
 			{
 				Name: "zot",
@@ -220,6 +223,7 @@ services:
       default: null
     volumes_from:
       - zot
+      - container:xxx
   foo:
     depends_on:
       bar: