From 576e52767dea22785aea36a457ba642439f4b6fe Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Wed, 25 Oct 2023 01:04:38 -0700 Subject: [PATCH] make podman a separate command rodman --- setup.py | 3 ++- src/rocker/cli.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 9bcca932..e7bfb0b3 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,8 @@ 'package_data': {'rocker': ['templates/*.em']}, 'entry_points': { 'console_scripts': [ - 'rocker = rocker.cli:main', + 'rocker = rocker.cli:rocker_main', + 'rodman = rocker.cli:rodman_main', 'detect_docker_image_os = rocker.cli:detect_image_os', ], 'rocker.extensions': [ diff --git a/src/rocker/cli.py b/src/rocker/cli.py index bd8995e8..c448f0e2 100644 --- a/src/rocker/cli.py +++ b/src/rocker/cli.py @@ -25,7 +25,7 @@ from .os_detector import detect_os -def main(): +def main(implementation='rocker'): parser = argparse.ArgumentParser( description='A tool for running docker with extra options', @@ -36,7 +36,6 @@ def main(): parser.add_argument('--nocache', action='store_true') parser.add_argument('--nocleanup', action='store_true', help='do not remove the docker container when stopped') parser.add_argument('--pull', action='store_true') - parser.add_argument('--use-podman', action='store_true') parser.add_argument('--version', action='version', version='%(prog)s ' + get_rocker_version()) @@ -50,6 +49,7 @@ def main(): args = parser.parse_args() args_dict = vars(args) + args_dict['use_podman'] = implementation == 'podman' if args.noexecute: from .core import OPERATIONS_DRY_RUN @@ -89,3 +89,10 @@ def detect_image_os(): return 0 else: return 1 + +def rocker_main(): + return main(implementation='rocker') + + +def rodman_main(): + return main(implementation='podman')