From 818957d24439144601561dc94f2e1a9fee15b57a Mon Sep 17 00:00:00 2001 From: David Boreham Date: Wed, 24 Aug 2022 13:53:48 -0600 Subject: [PATCH] Fixes --- app/build_containers.py | 4 +++- app/deploy_system.py | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/build_containers.py b/app/build_containers.py index fe6aa95b..51c43615 100644 --- a/app/build_containers.py +++ b/app/build_containers.py @@ -37,7 +37,7 @@ def command(ctx): quiet = ctx.obj.quiet verbose = ctx.obj.verbose - dry_run = ctx.obj.verbose + dry_run = ctx.obj.dry_run dev_root_path = os.path.expanduser(config("CERC_REPO_BASE_DIR", default="~/cerc")) @@ -67,6 +67,8 @@ def command(ctx): build_result = subprocess.run(build_script_filename, shell=True, env={'CERC_REPO_BASE_DIR':dev_root_path}) # TODO: check result in build_result.returncode print(f"Result is: {build_result}") + else: + print("Skipped") for container in containers: process_container(container) diff --git a/app/deploy_system.py b/app/deploy_system.py index 020fb671..5b8f424b 100644 --- a/app/deploy_system.py +++ b/app/deploy_system.py @@ -43,7 +43,7 @@ def command(ctx, include, exclude, command): quiet = ctx.obj.quiet verbose = ctx.obj.verbose - dry_run = ctx.obj.verbose + dry_run = ctx.obj.dry_run with open("cluster-list.txt") as cluster_list_file: clusters = cluster_list_file.read().splitlines() @@ -77,3 +77,11 @@ def command(ctx, include, exclude, command): if verbose: print("Running compose down") docker.compose.down() + elif command == "ps": + if verbose: + print("Running compose ps") + docker.compose.ps() + elif command == "logs": + if verbose: + print("Running compose logs") + docker.compose.logs()