mirror of
https://github.com/yavook/kiwi-scp.git
synced 2024-11-24 21:52:59 +00:00
Commands "cmd" and "sh"
This commit is contained in:
parent
feda828c06
commit
fc7d1d5ec4
5 changed files with 96 additions and 4 deletions
|
@ -13,7 +13,9 @@ from .subcommands import *
|
||||||
SUBCOMMANDS = [
|
SUBCOMMANDS = [
|
||||||
InitCommand,
|
InitCommand,
|
||||||
ShowCommand,
|
ShowCommand,
|
||||||
LogsCommand
|
LogsCommand,
|
||||||
|
CmdCommand,
|
||||||
|
ShellCommand
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,9 +2,13 @@
|
||||||
from .init import InitCommand
|
from .init import InitCommand
|
||||||
from .logs import LogsCommand
|
from .logs import LogsCommand
|
||||||
from .show import ShowCommand
|
from .show import ShowCommand
|
||||||
|
from .cmd import CmdCommand
|
||||||
|
from .shell import ShellCommand
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'InitCommand',
|
'InitCommand',
|
||||||
'LogsCommand',
|
'LogsCommand',
|
||||||
'ShowCommand'
|
'ShowCommand',
|
||||||
|
'CmdCommand',
|
||||||
|
'ShellCommand'
|
||||||
]
|
]
|
||||||
|
|
|
@ -43,13 +43,13 @@ class ProjectCommand(SubCommand):
|
||||||
class ServiceCommand(ProjectCommand):
|
class ServiceCommand(ProjectCommand):
|
||||||
"""this command concerns services in a project"""
|
"""this command concerns services in a project"""
|
||||||
|
|
||||||
def __init__(self, name, **kwargs):
|
def __init__(self, name, nargs='*', **kwargs):
|
||||||
super().__init__(
|
super().__init__(
|
||||||
name,
|
name,
|
||||||
**kwargs
|
**kwargs
|
||||||
)
|
)
|
||||||
|
|
||||||
self._sub_parser.add_argument(
|
self._sub_parser.add_argument(
|
||||||
'services', metavar='service', nargs='*', type=str,
|
'services', metavar='service', nargs=nargs, type=str,
|
||||||
help="select service(s) in a project"
|
help="select service(s) in a project"
|
||||||
)
|
)
|
||||||
|
|
29
src/kiwi/subcommands/cmd.py
Normal file
29
src/kiwi/subcommands/cmd.py
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
# system
|
||||||
|
import logging
|
||||||
|
|
||||||
|
# local
|
||||||
|
from ._subcommand import ProjectCommand
|
||||||
|
from .utils.dockercommand import DockerCommand
|
||||||
|
|
||||||
|
|
||||||
|
class CmdCommand(ProjectCommand):
|
||||||
|
def __init__(self):
|
||||||
|
super().__init__(
|
||||||
|
'cmd',
|
||||||
|
description="Run raw docker-compose command in a project"
|
||||||
|
)
|
||||||
|
|
||||||
|
# arguments for docker-compose command
|
||||||
|
self._sub_parser.add_argument(
|
||||||
|
'compose_cmd', metavar='cmd', type=str,
|
||||||
|
help="runs `docker-compose <cmd>"
|
||||||
|
)
|
||||||
|
|
||||||
|
def run(self, config, args):
|
||||||
|
try:
|
||||||
|
import shlex
|
||||||
|
DockerCommand('docker-compose').run(config, args, shlex.split(args.compose_cmd))
|
||||||
|
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
logging.debug("Subprocess aborted.")
|
||||||
|
print()
|
57
src/kiwi/subcommands/shell.py
Normal file
57
src/kiwi/subcommands/shell.py
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
# system
|
||||||
|
import logging
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
# local
|
||||||
|
from ._subcommand import ServiceCommand
|
||||||
|
from .utils.dockercommand import DockerCommand
|
||||||
|
|
||||||
|
|
||||||
|
def _service_has_shell(config, args, exec_service, try_shell):
|
||||||
|
try:
|
||||||
|
# test if desired shell exists
|
||||||
|
DockerCommand('docker-compose').run(
|
||||||
|
config, args, [*exec_service, '/bin/sh', '-c', f"which {try_shell}"],
|
||||||
|
check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
|
||||||
|
)
|
||||||
|
return True
|
||||||
|
|
||||||
|
except subprocess.CalledProcessError:
|
||||||
|
# fallback
|
||||||
|
logging.info(f"Shell '{try_shell}' not found in container")
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
class ShellCommand(ServiceCommand):
|
||||||
|
def __init__(self):
|
||||||
|
super().__init__(
|
||||||
|
'sh', 1,
|
||||||
|
description="Spawn shell inside project's service"
|
||||||
|
)
|
||||||
|
|
||||||
|
# -s switch: Select shell
|
||||||
|
self._sub_parser.add_argument(
|
||||||
|
'-s', '--shell', type=str, default="/bin/bash",
|
||||||
|
help="shell to spawn"
|
||||||
|
)
|
||||||
|
|
||||||
|
def run(self, config, args):
|
||||||
|
try:
|
||||||
|
exec_service = ['exec', args.services[0]]
|
||||||
|
exec_shell = args.shell
|
||||||
|
|
||||||
|
if not _service_has_shell(config, args, exec_service, exec_shell):
|
||||||
|
# fallback
|
||||||
|
exec_shell = '/bin/bash'
|
||||||
|
|
||||||
|
if not _service_has_shell(config, args, exec_service, exec_shell):
|
||||||
|
exec_shell = '/bin/sh'
|
||||||
|
|
||||||
|
# spawn shell
|
||||||
|
DockerCommand('docker-compose').run(
|
||||||
|
config, args, [*exec_service, exec_shell]
|
||||||
|
)
|
||||||
|
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
logging.debug("Subprocess aborted.")
|
||||||
|
print()
|
Loading…
Reference in a new issue