diff --git a/app/data/compose/docker-compose-mainnet-laconicd.yml b/app/data/compose/docker-compose-mainnet-laconicd.yml index 23f6c03..5037687 100644 --- a/app/data/compose/docker-compose-mainnet-laconicd.yml +++ b/app/data/compose/docker-compose-mainnet-laconicd.yml @@ -27,4 +27,4 @@ services: - ../config/fixturenet-laconicd/registry-cli-config-template.yml:/registry-cli-config-template.yml volumes: - laconicd-data \ No newline at end of file + laconicd-data: diff --git a/app/data/pod-list.txt b/app/data/pod-list.txt index 79d66e8..2c73bea 100644 --- a/app/data/pod-list.txt +++ b/app/data/pod-list.txt @@ -5,7 +5,6 @@ go-ethereum-foundry ipld-eth-beacon-db ipld-eth-beacon-indexer ipld-eth-server -lighthouse laconicd fixturenet-laconicd fixturenet-eth diff --git a/app/deploy.py b/app/deploy.py index 64f2ccb..c71ec8a 100644 --- a/app/deploy.py +++ b/app/deploy.py @@ -78,6 +78,18 @@ def up_operation(ctx, services_list): _orchestrate_cluster_config(global_context, cluster_context.config, deploy_context.docker, container_exec_env) +def down_operation(ctx, delete_volumes, extra_args_list): + global_context = ctx.parent.parent.obj + if not global_context.dry_run: + if global_context.verbose: + print("Running compose down") + timeout_arg = None + if extra_args_list: + timeout_arg = extra_args_list[0] + # Specify shutdown timeout (default 10s) to give services enough time to shutdown gracefully + ctx.obj.docker.compose.down(timeout=timeout_arg, volumes=delete_volumes) + + @command.command() @click.argument('extra_args', nargs=-1) # help: command: up @click.pass_context @@ -91,16 +103,8 @@ def up(ctx, extra_args): @click.argument('extra_args', nargs=-1) # help: command: down @click.pass_context def down(ctx, delete_volumes, extra_args): - global_context = ctx.parent.parent.obj extra_args_list = list(extra_args) or None - if not global_context.dry_run: - if global_context.verbose: - print("Running compose down") - timeout_arg = None - if extra_args_list: - timeout_arg = extra_args_list[0] - # Specify shutdown timeout (default 10s) to give services enough time to shutdown gracefully - ctx.obj.docker.compose.down(timeout=timeout_arg, volumes=delete_volumes) + down_operation(ctx, delete_volumes, extra_args_list) @command.command()