Skip to content

Commit c99594b

Browse files
committed
Add flag to run non-interactively
This will run docker run in non-interactive mode.
1 parent ed7d266 commit c99594b

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

edacontainerwrapper/main.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,20 @@ def main():
99
parser = argparse.ArgumentParser()
1010
parser.add_argument('--split-cwd-tail', type=int, default=RunArgumentsDefaults.split_cwd_tail)
1111
parser.add_argument('--tool-version')
12+
parser.add_argument('--non-interactive', action="store_true")
1213
parser.add_argument('tool', choices=tools.keys())
1314
parser.add_argument('toolargs', nargs='*')
1415
args = parser.parse_args()
1516
tool = args.tool
1617
toolargs = args.toolargs
1718
args = RunArguments(
1819
split_cwd_tail = args.split_cwd_tail,
19-
tool_version = args.tool_version if args.tool_version else tools[tool].default_version
20+
tool_version = args.tool_version if args.tool_version else tools[tool].default_version,
21+
interactive = not args.non_interactive
2022
)
2123
else:
2224
tool = sys.argv[0]
23-
args = RunArguments(split_cwd_tail=0)
25+
args = RunArguments(split_cwd_tail=0, interactive=True)
2426
toolargs = sys.argv[1:]
2527

2628
run(tool, args, toolargs)

edacontainerwrapper/run.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from collections import namedtuple
44
import os
55

6-
RunArguments = namedtuple("RunArguments", "split_cwd_tail tool_version")
7-
RunArgumentsDefaults = RunArguments(split_cwd_tail=0, tool_version=None)
6+
RunArguments = namedtuple("RunArguments", "split_cwd_tail tool_version interactive")
7+
RunArgumentsDefaults = RunArguments(split_cwd_tail=0, tool_version=None, interactive=True)
88

99
def split_path(path, depth):
1010
base = path
@@ -38,7 +38,7 @@ def run(toolname, args, toolargs):
3838
root, tail = split_path(os.getcwd(), int(os.getenv("SPLIT_CWD_TAIL", args.split_cwd_tail)))
3939
workdir = os.path.join(tool.projectpath, tail)
4040

41-
cmd = ["docker", "run", "-ti",
41+
cmd = ["docker", "run", "-ti" if args.interactive else "",
4242
"-v", f"{root}:{tool.projectpath}",
4343
"-u", f"{os.getuid()}:{os.getgid()}",
4444
"-w", f"{workdir}",

0 commit comments

Comments
 (0)