extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-04-30 12:24:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

#289: report exit code when --exit-code-from

Browse Source
This commit is contained in:
Sander Hoentjen 2021-05-06 02:08:48 +03:00 committed by Muayyad alsadi
parent a7f97b6120
commit 045cef299b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
podman_compose.py
View File

@ -695,7 +695,7 @@ class Podman:
cmd = [self.podman_path]+podman_args cmd = [self.podman_path]+podman_args
return subprocess.check_output(cmd) return subprocess.check_output(cmd)
def run(self, podman_args, wait=True, sleep=1): def run(self, podman_args, wait=True, sleep=1, obj=None):
podman_args_str = [str(arg) for arg in podman_args] podman_args_str = [str(arg) for arg in podman_args]
print("podman " + " ".join(podman_args_str)) print("podman " + " ".join(podman_args_str))
if self.dry_run: if self.dry_run:
@ -704,7 +704,11 @@ class Podman:
# subprocess.Popen(args, bufsize = 0, executable = None, stdin = None, stdout = None, stderr = None, preexec_fn = None, close_fds = False, shell = False, cwd = None, env = None, universal_newlines = False, startupinfo = None, creationflags = 0) # subprocess.Popen(args, bufsize = 0, executable = None, stdin = None, stdout = None, stderr = None, preexec_fn = None, close_fds = False, shell = False, cwd = None, env = None, universal_newlines = False, startupinfo = None, creationflags = 0)
p = subprocess.Popen(cmd) p = subprocess.Popen(cmd)
if wait: if wait:
print(p.wait()) exit_code = p.wait()
print(exit_code)
if obj is not None:
obj.exit_code = exit_code
if sleep: if sleep:
time.sleep(sleep) time.sleep(sleep)
return p return p
@ -792,6 +796,7 @@ def resolve_extends(services, service_names, dotenv_dict):
class PodmanCompose: class PodmanCompose:
def __init__(self): def __init__(self):
self.exit_code = None
self.commands = {} self.commands = {}
self.global_args = None self.global_args = None
self.project_name = None self.project_name = None
@ -1189,7 +1194,8 @@ def compose_up(compose, args):
threads = [] threads = []
for cnt in compose.containers: for cnt in compose.containers:
# TODO: remove sleep from podman.run # TODO: remove sleep from podman.run
thread = Thread(target=compose.podman.run, args=[['start', '-a', cnt['name']]], daemon=True) obj = compose if args.get(exit_code_from, None) == cnt['name'] else None
thread = Thread(target=compose.podman.run, args=[['start', '-a', cnt['name']], obj], daemon=True, name=cnt['name'])
thread.start() thread.start()
threads.append(thread) threads.append(thread)
time.sleep(1) time.sleep(1)
@ -1199,7 +1205,8 @@ def compose_up(compose, args):
if not thread.is_alive(): if not thread.is_alive():
threads.remove(thread) threads.remove(thread)
if args.abort_on_container_exit: if args.abort_on_container_exit:
exit(-1) exit_code = compose.exit_code if compose.exit_code is not None else -1
exit(exit_code)
@cmd_run(podman_compose, 'down', 'tear down entire stack') @cmd_run(podman_compose, 'down', 'tear down entire stack')
def compose_down(compose, args): def compose_down(compose, args):