extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2025-01-23 22:39:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

use add_subparsers

Browse Source
This commit is contained in:
Muayyad Alsadi 2019-08-10 18:08:21 +03:00
parent 2cf7cbba2e
commit 7e0a036ff4
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
podman-compose.py
View File

@ -1,4 +1,5 @@
#! /usr/bin/python3 #! /usr/bin/python3
# -*- coding: utf-8 -*-
# https://docs.docker.com/compose/compose-file/#service-configuration-reference # https://docs.docker.com/compose/compose-file/#service-configuration-reference
# https://docs.docker.com/samples/ # https://docs.docker.com/samples/
@ -470,12 +471,12 @@ def container_to_args(compose, cnt, detached=True):
raise ValueError("'healthcheck' must be an key-value mapping") raise ValueError("'healthcheck' must be an key-value mapping")
healthcheck_test = healthcheck.get('test') healthcheck_test = healthcheck.get('test')
if healthcheck_test: if healthcheck_test:
# If it’s a string, it’s equivalent to specifying CMD-SHELL # If it's a string, it's equivalent to specifying CMD-SHELL
if is_str(healthcheck_test): if is_str(healthcheck_test):
# podman does not add shell to handle command with whitespace # podman does not add shell to handle command with whitespace
podman_args.extend(['--healthcheck-command', '/bin/sh -c {}'.format(cmd_quote(healthcheck_test))]) podman_args.extend(['--healthcheck-command', '/bin/sh -c {}'.format(cmd_quote(healthcheck_test))])
elif is_list(healthcheck_test): elif is_list(healthcheck_test):
# If it’s a list, first item is either NONE, CMD or CMD-SHELL. # If it's a list, first item is either NONE, CMD or CMD-SHELL.
healthcheck_type = healthcheck_test.pop(0) healthcheck_type = healthcheck_test.pop(0)
if healthcheck_type == 'NONE': if healthcheck_type == 'NONE':
podman_args.append("--no-healthcheck") podman_args.append("--no-healthcheck")
@ -585,8 +586,8 @@ class PodmanCompose:
def run(self): def run(self):
args = self._parse_args() args = self._parse_args()
global_args = self.global_args self._parse_compose_file()
podman_path = global_args.podman_path podman_path = args.podman_path
if podman_path != 'podman': if podman_path != 'podman':
if os.path.isfile(podman_path) and os.access(podman_path, os.X_OK): if os.path.isfile(podman_path) and os.access(podman_path, os.X_OK):
podman_path = os.path.realpath(podman_path) podman_path = os.path.realpath(podman_path)
@ -596,8 +597,8 @@ class PodmanCompose:
raise IOError( raise IOError(
"Binary {} has not been found.".format(podman_path)) "Binary {} has not been found.".format(podman_path))
self.podman = Podman(self, podman_path, global_args.dry_run) self.podman = Podman(self, podman_path, args.dry_run)
cmd_name = global_args.command cmd_name = args.command
cmd = self.commands[cmd_name] cmd = self.commands[cmd_name]
cmd(self, args) cmd(self, args)
@ -622,6 +623,7 @@ class PodmanCompose:
dirname = os.path.dirname(filename) dirname = os.path.dirname(filename)
dir_basename = os.path.basename(dirname) dir_basename = os.path.basename(dirname)
self.dirname = dirname self.dirname = dirname
# TODO: remove next line
os.chdir(dirname) os.chdir(dirname)
if not project_name: if not project_name:
@ -639,7 +641,6 @@ class PodmanCompose:
with open(filename, 'r') as f: with open(filename, 'r') as f:
compose = rec_subs(yaml.safe_load(f), [os.environ, dotenv_dict]) compose = rec_subs(yaml.safe_load(f), [os.environ, dotenv_dict])
compose['_dirname']=dirname compose['_dirname']=dirname
# debug mode # debug mode
#print(json.dumps(compose, indent = 2)) #print(json.dumps(compose, indent = 2))
@ -712,26 +713,16 @@ class PodmanCompose:
def _parse_args(self): def _parse_args(self):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
self._init_global_parser(parser) self._init_global_parser(parser)
subparsers = parser.add_subparsers(title='command', dest='command')
subparsers.default = 'up'
for cmd_name, cmd in self.commands.items():
subparser = subparsers.add_parser(cmd_name, help=cmd._cmd_desc)
for cmd_parser in cmd._parse_args:
cmd_parser(subparser)
self.global_args = parser.parse_args() self.global_args = parser.parse_args()
self._parse_compose_file() return self.global_args
self.args = self._init_cmd_parser(self.global_args)
return self.args
def _init_cmd_parser(self, global_args):
cmd_name = global_args.command
# TODO: use parser.add_subparsers
parser = argparse.ArgumentParser(description=self.commands[cmd_name]._cmd_desc)
parser.prog+=' '+cmd_name
# self._init_global_parser(parser)
for cmd_parser in self.commands[cmd_name]._parse_args:
cmd_parser(parser)
return parser.parse_args(global_args.args)
def _init_global_parser(self, parser): def _init_global_parser(self, parser):
cmds = list(self.commands.keys())
parser.add_argument('command', metavar='command',
help='command to run, on of {}'.format(cmds),
choices=cmds, nargs=None, default="up")
parser.add_argument('args', nargs=argparse.REMAINDER) parser.add_argument('args', nargs=argparse.REMAINDER)
parser.add_argument("-f", "--file", parser.add_argument("-f", "--file",
help="Specify an alternate compose file (default: docker-compose.yml)", help="Specify an alternate compose file (default: docker-compose.yml)",