fix(volumes): manage subpath into volume

Force refer_volume_over_mount to false and add code to add subpath
option in podman command line.

Signed-off-by: fccagou <[email protected]>

Author: fccagou

podman_compose.py

@@ -480,6 +480,10 @@ def mount_desc_to_mount_args(mount_desc: dict[str, Any]) -> str:
         selinux = bind_opts.get("selinux")
         if selinux is not None:
             opts.append(selinux)
+    else:
+        subpath = mount_desc.get("subpath")
+        if subpath is not None:
+            opts.append(f"subpath={subpath}")
     opts_str = ",".join(opts)
     if mount_type == "bind":
         return f"type=bind,source={source},destination={target},{opts_str}".rstrip(",")
@@ -1186,7 +1190,6 @@ async def container_to_args(
         podman_args.extend(["--tmpfs", i])
     for volume in cnt.get("volumes", []):
         podman_args.extend(await get_mount_args(compose, cnt, volume))
-
     await assert_cnt_nets(compose, cnt)
     podman_args.extend(get_net_args(compose, cnt))
 
@@ -2064,7 +2067,7 @@ def __init__(self) -> None:
         self.container_by_name: dict[str, Any]
         self.services: dict[str, Any]
         self.all_services: set[Any] = set()
-        self.prefer_volume_over_mount = True
+        self.prefer_volume_over_mount = False
         self.x_podman: dict[PodmanCompose.XPodmanSettingKey, Any] = {}
         self.merged_yaml: Any
         self.yaml_hash = ""

tests/integration/selinux/test_podman_compose_selinux.py

@@ -38,7 +38,15 @@ def test_selinux(self) -> None:
             inspect_out = json.loads(out)
             create_command_list = inspect_out[0].get("Config", []).get("CreateCommand", [])
             host_path = os.path.join(test_path(), "selinux", "host_test_text.txt")
-            self.assertIn(f'{host_path}:/test_text.txt:z', create_command_list)
+            try:
+                # podman-compose.py: prefer_volume_over_mount set to False
+                self.assertIn(
+                    f'type=bind,source={host_path},destination=/test_text.txt,z',
+                    create_command_list,
+                )
+            except AssertionError:
+                # podman-compose.py: prefer_volume_over_mount set to True
+                self.assertIn(f'{host_path}:/test_text.txt:z', create_command_list)
 
             out, _ = self.run_subprocess_assert_returncode([
                 "podman",
@@ -48,7 +56,14 @@ def test_selinux(self) -> None:
             inspect_out = json.loads(out)
             create_command_list = inspect_out[0].get("Config", []).get("CreateCommand", [])
             host_path = os.path.join(test_path(), "selinux", "host_test_text.txt")
-            self.assertIn(f'{host_path}:/test_text.txt', create_command_list)
+            try:
+                # podman-compose.py: prefer_volume_over_mount set to False
+                self.assertIn(
+                    f'type=bind,source={host_path},destination=/test_text.txt', create_command_list
+                )
+            except AssertionError:
+                # podman-compose.py: prefer_volume_over_mount set to True
+                self.assertIn(f'{host_path}:/test_text.txt', create_command_list)
         finally:
             out, _ = self.run_subprocess_assert_returncode([
                 podman_compose_path(),