opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1824 from afbjorklund/pypodman_user

Browse Source 
pypodman: Don't use $HOST and $USER variables for remote
This commit is contained in:
OpenShift Merge Robot
2018-11-19 08:45:06 -08:00
committed by GitHub
parent 64a29e383b 4adc69f4f9
commit ea928f2de6
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/python/pypodman/docs/man1/pypodman.1
View File

@ -85,7 +85,7 @@ overwriting earlier. Any missing items are ignored.
.IP \[bu] 2 .IP \[bu] 2
From \f[C]\-\-config\-home\f[] command line option + \f[C]pypodman/pypodman.conf\f[] From \f[C]\-\-config\-home\f[] command line option + \f[C]pypodman/pypodman.conf\f[]
.IP \[bu] 2 .IP \[bu] 2
From environment variable, for example: RUN_DIR From environment variable prefixed with PODMAN_, for example: PODMAN_RUN_DIR
.IP \[bu] 2 .IP \[bu] 2
From command line option, for example: \[en]run\-dir From command line option, for example: \[en]run\-dir
.PP .PP

15
contrib/python/pypodman/pypodman/lib/podman_parser.py
View File

@ -152,7 +152,7 @@ class PodmanArgumentParser(argparse.ArgumentParser):
reqattr( reqattr(
'run_dir', 'run_dir',
getattr(args, 'run_dir') getattr(args, 'run_dir')
or os.environ.get('RUN_DIR') or os.environ.get('PODMAN_RUN_DIR')
or config['default'].get('run_dir') or config['default'].get('run_dir')
or str(Path(args.xdg_runtime_dir, 'pypodman')) or str(Path(args.xdg_runtime_dir, 'pypodman'))
) # yapf: disable ) # yapf: disable
@ -161,23 +161,24 @@ class PodmanArgumentParser(argparse.ArgumentParser):
args, args,
'host', 'host',
getattr(args, 'host') getattr(args, 'host')
or os.environ.get('HOST') or os.environ.get('PODMAN_HOST')
or config['default'].get('host') or config['default'].get('host')
) # yapf:disable ) # yapf:disable
reqattr( reqattr(
'username', 'username',
getattr(args, 'username') getattr(args, 'username')
or os.environ.get('PODMAN_USER')
or config['default'].get('username')
or os.environ.get('USER') or os.environ.get('USER')
or os.environ.get('LOGNAME') or os.environ.get('LOGNAME')
or config['default'].get('username')
or getpass.getuser() or getpass.getuser()
) # yapf:disable ) # yapf:disable
reqattr( reqattr(
'port', 'port',
getattr(args, 'port') getattr(args, 'port')
or os.environ.get('PORT') or os.environ.get('PODMAN_PORT')
or config['default'].get('port', None) or config['default'].get('port', None)
or 22 or 22
) # yapf:disable ) # yapf:disable
@ -185,7 +186,7 @@ class PodmanArgumentParser(argparse.ArgumentParser):
reqattr( reqattr(
'remote_socket_path', 'remote_socket_path',
getattr(args, 'remote_socket_path') getattr(args, 'remote_socket_path')
or os.environ.get('REMOTE_SOCKET_PATH') or os.environ.get('PODMAN_REMOTE_SOCKET_PATH')
or config['default'].get('remote_socket_path') or config['default'].get('remote_socket_path')
or '/run/podman/io.podman' or '/run/podman/io.podman'
) # yapf:disable ) # yapf:disable
@ -193,7 +194,7 @@ class PodmanArgumentParser(argparse.ArgumentParser):
reqattr( reqattr(
'log_level', 'log_level',
getattr(args, 'log_level') getattr(args, 'log_level')
or os.environ.get('LOG_LEVEL') or os.environ.get('PODMAN_LOG_LEVEL')
or config['default'].get('log_level') or config['default'].get('log_level')
or logging.WARNING or logging.WARNING
) # yapf:disable ) # yapf:disable
@ -202,7 +203,7 @@ class PodmanArgumentParser(argparse.ArgumentParser):
args, args,
'identity_file', 'identity_file',
getattr(args, 'identity_file') getattr(args, 'identity_file')
or os.environ.get('IDENTITY_FILE') or os.environ.get('PODMAN_IDENTITY_FILE')
or config['default'].get('identity_file') or config['default'].get('identity_file')
or os.path.expanduser('~{}/.ssh/id_dsa'.format(args.username)) or os.path.expanduser('~{}/.ssh/id_dsa'.format(args.username))
) # yapf:disable ) # yapf:disable