add label_domain

Author: legobeat

podman_compose.py

@@ -1676,6 +1676,7 @@ def __init__(self):
         self.commands = {}
         self.global_args = None
         self.project_name = None
+        self.label_domain = None
         self.dirname = None
         self.pods = None
         self.containers = None
@@ -1793,6 +1794,7 @@ def _parse_compose_file(self):
         relative_files = files
         filename = files[0]
         project_name = args.project_name
+        label_domain = args.label_domain
         # no_ansi = args.no_ansi
         # no_cleanup = args.no_cleanup
         # dry_run = args.dry_run
@@ -1894,6 +1896,7 @@ def _parse_compose_file(self):
                     raise RuntimeError(f"Project name [{dir_basename}] normalized to empty")
 
         self.project_name = project_name
+        self.label_domain = label_domain
         self.environ.update({"COMPOSE_PROJECT_NAME": self.project_name})
 
         services = compose.get("services", None)
@@ -1938,18 +1941,15 @@ def _parse_compose_file(self):
             raise RuntimeError(f"missing networks: {missing_nets_str}")
         # volumes: [...]
         self.vols = compose.get("volumes", {})
-        podman_compose_labels = list(set([
-            compose.label_domain + ".config-hash=" + self.yaml_hash,
-            compose.label_domain + ".project=" + project_name,
-            compose.label_domain + ".version=" + __version__,
-            "io.podman.compose.config-hash=" + self.yaml_hash,
-            "io.podman.compose.project=" + project_name,
-            "io.podman.compose.version=" + __version__,
+        podman_compose_labels = [
+            label_domain + ".config-hash=" + self.yaml_hash,
+            label_domain + ".project=" + project_name,
+            label_domain + ".version=" + __version__,
             f"PODMAN_SYSTEMD_UNIT=podman-compose@{project_name}.service",
             "com.docker.compose.project=" + project_name,
             "com.docker.compose.project.working_dir=" + dirname,
             "com.docker.compose.project.config_files=" + ",".join(relative_files),
-        ]))
+        ]
         # other top-levels:
         # networks: {driver: ...}
         # configs: {...}
@@ -2119,6 +2119,13 @@ def _init_global_parser(parser):
             type=str,
             default=None,
         )
+        parser.add_argument(
+            "--label-domain",
+            help="Specify an alternate root domain for resource labels (default: io.podman)",
+            type=str,
+            metavar="label_domain",
+            default="io.podman",
+        )
         parser.add_argument(
             "--podman-path",
             help="Specify an alternate path to podman (default: use location in $PATH variable)",
@@ -2505,7 +2512,7 @@ async def compose_up(compose: PodmanCompose, args):
                     f"label={compose.label_domain}.project={compose.project_name}",
                     "-a",
                     "--format",
-                    '{{ index .Labels "'+ compose.label_domain '.config-hash"}}',
+                    '{{ index .Labels "' + compose.label_domain + '.config-hash"}}',
                 ],
             )
         )

tests/unit/test_get_network_create_args.py

@@ -26,6 +26,29 @@ def test_minimal(self):
         args = get_network_create_args(net_desc, proj_name, net_name)
         self.assertEqual(args, expected_args)
 
+    def test_minimal_namespace(self):
+        net_desc = {
+            "labels": [],
+            "internal": False,
+            "driver": None,
+            "driver_opts": {},
+            "ipam": {"config": []},
+            "enable_ipv6": False,
+        }
+        proj_name = "test_project"
+        label_domain = "foo.bar",
+        net_name = "test_network"
+        expected_args = [
+            "create",
+            "--label",
+            f"foo.bar.compose.project={proj_name}",
+            "--label",
+            f"com.docker.compose.project={proj_name}",
+            net_name,
+        ]
+        args = get_network_create_args(net_desc, proj_name, net_name, label_domain)
+        self.assertEqual(args, expected_args)
+
     def test_ipv6(self):
         net_desc = {
             "labels": [],