From 4557279930927149e8d9a1d601ef0cd49e252452 Mon Sep 17 00:00:00 2001
From: Muayyad alsadi <alsadi@gmail.com>
Date: Sat, 25 Dec 2021 21:06:29 +0200
Subject: [PATCH] #88: multiple aliases

---
 podman_compose.py                   | 17 ++++++++++++++---
 tests/nets_test3/docker-compose.yml | 14 ++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/podman_compose.py b/podman_compose.py
index c4127c7..5cd3742 100755
--- a/podman_compose.py
+++ b/podman_compose.py
@@ -551,7 +551,10 @@ def assert_cnt_nets(compose, cnt):
     proj_name = compose.project_name
     nets = compose.networks
     default_net = compose.default_net
-    cnt_nets = norm_as_list(cnt.get("networks", None) or default_net)
+    cnt_nets = cnt.get("networks", None)
+    if cnt_nets and is_dict(cnt_nets):
+        cnt_nets = list(cnt_nets.keys())
+    cnt_nets = norm_as_list(cnt_nets or default_net)
     for net in cnt_nets:
         net_desc = nets[net] or {}
         is_ext = net_desc.get("external", None)
@@ -582,7 +585,15 @@ def get_net_args(compose, cnt):
     proj_name = compose.project_name
     default_net = compose.default_net
     nets = compose.networks
-    cnt_nets = norm_as_list(cnt.get("networks", None) or default_net)
+    cnt_nets = cnt.get("networks", None)
+    aliases = [service_name]
+    # NOTE: from podman manpage:
+    # NOTE: A container will only have access to aliases on the first network that it joins. This is a limitation that will be removed in a later release.
+    if cnt_nets and is_dict(cnt_nets):
+        for net_key, net_value in cnt_nets.items():
+            aliases.extend(norm_as_list(net_value.get("aliases", None)))
+        cnt_nets = list(cnt_nets.keys())
+    cnt_nets = norm_as_list(cnt_nets or default_net)
     net_names = set()
     for net in cnt_nets:
         net_desc = nets[net] or {}
@@ -592,7 +603,7 @@ def get_net_args(compose, cnt):
         net_name = ext_desc.get("name", None) or net_desc.get("name", None) or default_net_name
         net_names.add(net_name)
     net_names_str = ",".join(net_names)
-    return ["--net", net_names_str, "--network-alias", service_name]
+    return ["--net", net_names_str, "--network-alias", ",".join(aliases)]
 
 def container_to_args(compose, cnt, detached=True):
     # TODO: double check -e , --add-host, -v, --read-only
diff --git a/tests/nets_test3/docker-compose.yml b/tests/nets_test3/docker-compose.yml
index 75847e0..a492068 100644
--- a/tests/nets_test3/docker-compose.yml
+++ b/tests/nets_test3/docker-compose.yml
@@ -28,4 +28,18 @@ services:
         - 8002:8001
       volumes:
         - ./test2.txt:/var/www/html/index.txt:ro,z
+    web3:
+      image: busybox
+      command: ["/bin/busybox", "httpd", "-f", "-h", "/var/www/html", "-p", "8001"]
+      working_dir: /var/www/html
+      networks:
+        net1:
+          aliases:
+          - alias11
+          - alias12
+        net2:
+          aliases:
+          - alias21
+      volumes:
+        - ./test2.txt:/var/www/html/index.txt:ro,z