Do not strip file from container_volume_mounts.

ansible · Jan 21, 2025 · 4775c98 · 4775c98
1 parent ec628a3
commit 4775c98
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/ansible_runner/config/_base.py b/src/ansible_runner/config/_base.py
@@ -395,7 +395,8 @@ def _update_volume_mount_paths(self,
                                    args_list: list[str],
                                    src_mount_path: str | None,
                                    dst_mount_path: str | None = None,
-                                   labels: str | None = None
+                                   labels: str | None = None,
+                                   strip_file: bool = True,
                                    ) -> None:
 
         if src_mount_path is None or not os.path.exists(src_mount_path):
@@ -417,10 +418,12 @@ def _update_volume_mount_paths(self,
         else:
             dst_path = os.path.abspath(os.path.expanduser(os.path.expandvars(dst_mount_path)))
 
+        src_is_dir = os.path.isdir(src_path)
+
         # ensure each is a directory not file, use src for dest
         # because dest doesn't exist locally
-        src_dir = src_path if os.path.isdir(src_path) else os.path.dirname(src_path)
-        dst_dir = dst_path if os.path.isdir(src_path) else os.path.dirname(dst_path)
+        src_dir = src_path if src_is_dir else os.path.dirname(src_path)
+        dst_dir = dst_path if src_is_dir else os.path.dirname(dst_path)
 
         # always ensure a trailing slash
         src_dir = os.path.join(src_dir, "")
@@ -432,7 +435,10 @@ def _update_volume_mount_paths(self,
         self._ensure_path_safe_to_mount(dst_dir)
 
         # format the src dest str
-        volume_mount_path = f"{src_dir}:{dst_dir}"
+        if strip_file or src_is_dir:
+            volume_mount_path = f"{src_dir}:{dst_dir}"
+        else:
+            volume_mount_path = f"{src_path}:{dst_path}"
 
         # add labels as needed
         if labels:
@@ -571,7 +577,7 @@ def wrap_args_for_containerization(self,
                 labels = None
                 if len(volume_mounts) == 3:
                     labels = f":{volume_mounts[2]}"
-                self._update_volume_mount_paths(new_args, volume_mounts[0], dst_mount_path=volume_mounts[1], labels=labels)
+                self._update_volume_mount_paths(new_args, volume_mounts[0], dst_mount_path=volume_mounts[1], labels=labels, strip_file=False)
 
         # Reference the file with list of keys to pass into container
         # this file will be written in ansible_runner.runner