fix: correctly modify volumes when normalizing services in a subdir

This fixes relative paths when using `extends` to include another service from a
different directory

Signed-off-by: Dominik Süß <[email protected]>

Author: theSuess

podman_compose.py

@@ -53,6 +53,9 @@ def is_list(list_object: Any) -> bool:
         and hasattr(list_object, "__iter__")
     )
 
+def is_relative_ref(path: str) -> bool:
+    return path.startswith("./") or path.startswith(".:") or path.startswith("../") or path.startswith("..:")
+    
 
 # identity filter
 def filteri(a: list[str]) -> list[str]:
@@ -1810,6 +1813,19 @@ def normalize_service(service: dict[str, Any], sub_dir: str = "") -> dict[str, A
         for k, v in deps.items():
             v.setdefault('condition', 'service_started')
         service["depends_on"] = deps
+    if "volumes" in service and sub_dir:
+        new_volumes = []
+        for v in service["volumes"]:
+            if isinstance(v, str):
+                if is_relative_ref(v):
+                    v = os.path.join(sub_dir,v)
+            elif isinstance(v, dict):
+                source = v["source"]
+                if is_relative_ref(source):
+                    v["source"] = (os.path.join(sub_dir,source))
+
+            new_volumes.append(v)
+        service["volumes"] = new_volumes
     return service
 
 

tests/unit/test_normalize_service.py

@@ -47,6 +47,30 @@ def test_simple(self, input: dict[str, Any], expected: dict[str, Any]) -> None:
             {"build": {"context": "./dir-1", "dockerfile": "dockerfile-1"}},
             {"build": {"context": "./sub_dir/dir-1", "dockerfile": "dockerfile-1"}},
         ),
+        (
+            {"volumes": ["./nested/relative:/mnt","../dir-in-parent:/mnt","..:/mnt",".:/mnt"]},
+            {"volumes": ["./sub_dir/./nested/relative:/mnt","./sub_dir/../dir-in-parent:/mnt","./sub_dir/..:/mnt","./sub_dir/.:/mnt"]},
+        ),
+        (
+            {
+                "volumes": [
+                    {
+                        "type": "bind",
+                        "source": "./nested/relative",
+                        "target": "/mnt",
+                    }
+                ]
+            },
+            {
+                "volumes": [
+                    {
+                        "type": "bind",
+                        "source": "./sub_dir/./nested/relative",
+                        "target": "/mnt",
+                    }
+                ]
+            },
+        ),
     ])
     def test_normalize_service_with_sub_dir(
         self, input: dict[str, Any], expected: dict[str, Any]