Go back to :zZ --volume option to not confuse with shared mount option

Signed-off-by: Jaroslav Henner <1187265+jarovo@users.noreply.github.com>

Author: jarovo

docs/Extensions.md

@@ -31,9 +31,9 @@ For explanations of these extensions, please refer to the [Podman Documentation]
 ```yml
 secrets:
   custom-secret:
-    x-podman.relabel: private
+    x-podman.relabel: Z
 ```
-For explanations of these extensions, please refer to the [Linux kernel documentation for shared filesystem subtrees](https://docs.kernel.org/filesystems/sharedsubtree.html)).
+For explanations of these extensions, please refer to the [podman-run --volume documentation](https://docs.podman.io/en/latest/markdown/podman-run.1.html#volume-v-source-volume-host-dir-container-dir-options)).
 
 ## Network management
 

podman_compose.py

@@ -622,13 +622,13 @@ def get_secret_args(compose, cnt, secret, podman_is_building=False):
 
             mount_options = 'ro,rprivate,rbind'
 
-            selinux_relabel_to_mount_option_map = {None: "", "shared": ",z", "private": ",Z"}
+            selinux_relabel_to_mount_option_map = {None: "", "z": ",z", "Z": ",Z"}
             try:
                 selinux_mount_option = selinux_relabel_to_mount_option_map[x_podman_relabel]
             except KeyError as exc:
                 raise ValueError(
                     f'ERORR: Run secret "{secret_name} has invalid "relabel" option related '
-                    + f' to SELinux "{x_podman_relabel}". Expected "shared" "private" or nothing.'
+                    + f' to SELinux "{x_podman_relabel}". Expected "z" "Z" or nothing.'
                 ) from exc
             mount_options = f'{mount_options}{selinux_mount_option}'
             volume_ref = ["--volume", f"{source_file}:{dest_file}:{mount_options}"]

tests/unit/test_container_to_args_secrets.py

@@ -304,13 +304,13 @@ async def test_secret_target_matches_secret_name_secret_type_not_env(self):
         ),
         (
             "relabel",
-            {"file_secret": {"file": "./my_secret", "x-podman.relabel": "private"}},
+            {"file_secret": {"file": "./my_secret", "x-podman.relabel": "Z"}},
             "file_secret",
             repo_root() + "/test_dirname/my_secret:/run/secrets/file_secret:ro,rprivate,rbind,Z",
         ),
         (
             "relabel",
-            {"file_secret": {"file": "./my_secret", "x-podman.relabel": "shared"}},
+            {"file_secret": {"file": "./my_secret", "x-podman.relabel": "z"}},
             "file_secret",
             repo_root() + "/test_dirname/my_secret:/run/secrets/file_secret:ro,rprivate,rbind,z",
         ),