jmm/kiwi-scp
2
0
Fork 0
Code Projects Wiki Activity

dependencies

Browse source
This commit is contained in:
Jörn-Michael Miehe 2020-08-17 14:51:43 +02:00
parent 79520c2a63
commit 2acbc1c534
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/kiwi/subcommands/net.py
View file

@ -5,6 +5,7 @@ import subprocess
# local # local
from ._subcommand import SubCommand from ._subcommand import SubCommand
from .utils.dockercommand import DockerCommand from .utils.dockercommand import DockerCommand
from .utils.user_input import are_you_sure
def _find_net(config, args): def _find_net(config, args):
@ -65,12 +66,15 @@ class NetDownCommand(SubCommand):
return return
try: try:
DockerCommand('docker').run( if are_you_sure("This will bring down this instance's hub network!"):
config, args, runner.run('down')
['network', 'rm', config['network:name']],
check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL DockerCommand('docker').run(
) config, args,
logging.info(f"Network '{config['network:name']}' removed") ['network', 'rm', config['network:name']],
check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
)
logging.info(f"Network '{config['network:name']}' removed")
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
logging.error(f"Error removing network '{config['network:name']}'") logging.error(f"Error removing network '{config['network:name']}'")

13
src/kiwi/subcommands/up.py
View file

@ -4,7 +4,7 @@ import logging
# local # local
from ._subcommand import ServiceCommand from ._subcommand import ServiceCommand
from .utils.dockercommand import DockerCommand from .utils.dockercommand import DockerCommand
from .utils.project import list_projects from .utils.project import get_project_name, list_projects
class UpCommand(ServiceCommand): class UpCommand(ServiceCommand):
@ -13,20 +13,23 @@ class UpCommand(ServiceCommand):
def __init__(self): def __init__(self):
super().__init__( super().__init__(
'up', num_projects='?', num_services='*', 'up', num_projects='?', num_services='*',
description="Start the whole instance, a project or service(s) inside a project" description="Bring up the whole instance, a project or service(s) inside a project"
) )
def run(self, runner, config, args): def run(self, runner, config, args):
if args.projects is None: if 'projects' not in args or args.projects is None:
# "up" for all projects # "up" for all projects
for project_name in list_projects(config): for project_name in list_projects(config):
logging.info(f"Bringing up project '{project_name}'")
args.projects = project_name args.projects = project_name
runner.run('up') runner.run('up')
return return
if 'services' in args and args.services:
logging.info(f"Bringing up services {args.services} in project '{get_project_name(args)}'")
else:
logging.info(f"Bringing up project '{get_project_name(args)}'")
runner.run('net-up') runner.run('net-up')
DockerCommand('docker-compose').run( DockerCommand('docker-compose').run(
config, args, ['up', '-d', *args.services] config, args, ['up', '-d', *args.services]