From d8e11d59ef0cae17e982fa374b2c61f5d132c2ca Mon Sep 17 00:00:00 2001
From: Muayyad alsadi <alsadi@gmail.com>
Date: Sun, 14 Nov 2021 01:37:22 +0200
Subject: [PATCH] FIXES #312: run starts dependencies

---
 podman_compose.py              | 17 +++++++++++++----
 tests/deps/README.md           |  4 ++++
 tests/deps/docker-compose.yaml | 24 ++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 tests/deps/README.md
 create mode 100644 tests/deps/docker-compose.yaml

diff --git a/podman_compose.py b/podman_compose.py
index 062ccb9..69a6a6d 100755
--- a/podman_compose.py
+++ b/podman_compose.py
@@ -851,10 +851,14 @@ def flat_deps(services, with_extends=False):
             if ext:
                 if ext != name: deps.add(ext)
                 continue
-        deps.update(srv.get("depends_on", []))
+        deps_ls = srv.get("depends_on", None) or []
+        if not is_list(deps_ls): deps_ls=[deps_ls]
+        deps.update(deps_ls)
         # parse link to get service name and remove alias
+        links_ls = srv.get("links", None) or []
+        if not is_list(links_ls): links_ls=[links_ls]
         deps.update([(c.split(":")[0] if ":" in c else c)
-            for c in srv.get("links", [])])
+            for c in links_ls])
     for name, srv in services.items():
         rec_deps(services, name)
 
@@ -1501,8 +1505,13 @@ def compose_run(compose, args):
     cnt = compose.container_by_name[container_name]
     deps = cnt["_deps"]
     if not args.no_deps:
-        # TODO: start services in deps
-        pass
+        up_args = argparse.Namespace(**dict(args.__dict__,
+               detach=True, services=deps,
+               # defaults
+               no_build=False, build=True, force_recreate=False, no_start=False,
+               )
+        )
+        compose.commands['up'](compose, up_args)
     # adjust one-off container options
     name0 = "{}_{}_tmp{}".format(compose.project_name, args.service, random.randrange(0, 65536))
     cnt["name"] = args.name or name0
diff --git a/tests/deps/README.md b/tests/deps/README.md
new file mode 100644
index 0000000..bde213a
--- /dev/null
+++ b/tests/deps/README.md
@@ -0,0 +1,4 @@
+
+```
+podman-compose run --rm sleep /bin/sh -c 'wget -O - http://localhost:8000/hosts'
+```
diff --git a/tests/deps/docker-compose.yaml b/tests/deps/docker-compose.yaml
new file mode 100644
index 0000000..0f06bbd
--- /dev/null
+++ b/tests/deps/docker-compose.yaml
@@ -0,0 +1,24 @@
+version: "3.7"
+services:
+    web:
+      image: busybox
+      command: ["/bin/busybox", "httpd", "-f", "-h", "/etc/", "-p", "8000"]
+      tmpfs:
+        - /run
+        - /tmp
+    sleep:
+      image: busybox
+      command: ["/bin/busybox", "sh", "-c", "sleep 3600"]
+      depends_on: "web"
+      tmpfs:
+        - /run
+        - /tmp
+    sleep2:
+      image: busybox
+      command: ["/bin/busybox", "sh", "-c", "sleep 3600"]
+      depends_on:
+      - sleep
+      tmpfs:
+        - /run
+        - /tmp
+