Fix absolute path handling for inherited volumes

Volumes keep unix-like absolute paths untouched, which was not the case for
inherited volumes from extended services. Fix this by using the same
method, which is used by standard volume path resolution.

Signed-off-by: Oldřich Jedlička <[email protected]>

Author: oldium

loader/loader.go

@@ -556,7 +556,7 @@ func loadServiceWithExtends(filename, name string, servicesDict map[string]inter
 				if vol.Type != types.VolumeTypeBind {
 					continue
 				}
-				baseService.Volumes[i].Source = absPath(baseFileParent, vol.Source)
+				baseService.Volumes[i].Source = resolveMaybeUnixPath(vol.Source, baseFileParent, lookupEnv)
 			}
 		}
 

loader/loader_test.go

@@ -1834,6 +1834,12 @@ func TestLoadWithExtends(t *testing.T) {
 			},
 			Environment: types.MappingWithEquals{},
 			Networks:    map[string]*types.ServiceNetworkConfig{"default": nil},
+			Volumes:     []types.ServiceVolumeConfig{{
+				Type:   "bind",
+				Source: "/opt/data",
+				Target: "/var/lib/mysql",
+				Bind:   &types.ServiceVolumeBind{CreateHostPath: true},
+			}},
 			Scale:       1,
 		},
 	}

loader/testdata/compose-test-extends-imported.yaml

@@ -1,3 +1,5 @@
 services:
   imported:
     image: nginx
+    volumes:
+      - /opt/data:/var/lib/mysql