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]>
compose-spec · Sep 8, 2022 · fe74f69 · fe74f69
1 parent f4cd055
commit fe74f69
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/loader/loader.go b/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)
 			}
 		}
 

diff --git a/loader/loader_test.go b/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,
 		},
 	}

diff --git a/loader/testdata/compose-test-extends-imported.yaml b/loader/testdata/compose-test-extends-imported.yaml
@@ -1,3 +1,5 @@
 services:
   imported:
     image: nginx
+    volumes:
+      - /opt/data:/var/lib/mysql