From 8105edfd1b4ab7e2352bb008eb9ba6874005581c Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 12 Apr 2021 09:20:28 +0200 Subject: [PATCH] Add missing argument to wrapper script --- wrapper/nlp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/wrapper/nlp b/wrapper/nlp index 68a9b77..28df5be 100755 --- a/wrapper/nlp +++ b/wrapper/nlp @@ -8,25 +8,29 @@ import subprocess CONTAINER_IMAGE = 'gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/nlp:1.0.0' CONTAINER_INPUT_DIR = '/input' CONTAINER_OUTPUT_DIR = '/output' +CONTAINER_LOG_DIR = '/logs' UID = str(os.getuid()) GID = str(os.getgid()) parser = ArgumentParser(add_help=False) -parser.add_argument('-i', '--input-directory') -parser.add_argument('-o', '--output-directory') +parser.add_argument('-i', '--input-dir') +parser.add_argument('-o', '--output-dir') +parser.add_argument('--log-dir') args, remaining_args = parser.parse_known_args() cmd = ['docker', 'run', '--rm', '-it', '-u', '{}:{}'.format(UID, GID)] -if args.output_directory is not None: - cmd += ['-v', '{}:{}'.format(os.path.abspath(args.output_directory), - CONTAINER_OUTPUT_DIR)] - remaining_args.insert(0, CONTAINER_OUTPUT_DIR) - remaining_args.insert(0, '-o') -if args.input_directory is not None: - cmd += ['-v', '{}:{}'.format(os.path.abspath(args.input_directory), - CONTAINER_INPUT_DIR)] - remaining_args.insert(0, CONTAINER_INPUT_DIR) - remaining_args.insert(0, '-i') +if args.input_dir is not None: + mapping = os.path.abspath(args.input_dir) + ':' + CONTAINER_INPUT_DIR + cmd += ['-v', mapping] + remaining_args += ['-i', CONTAINER_INPUT_DIR] +if args.output_dir is not None: + mapping = os.path.abspath(args.output_dir) + ':' + CONTAINER_OUTPUT_DIR + cmd += ['-v', mapping] + remaining_args += ['-o', CONTAINER_OUTPUT_DIR] +if args.log_dir is not None: + mapping = os.path.abspath(args.log_dir) + ':' + CONTAINER_LOG_DIR + cmd += ['-v', mapping] + remaining_args += ['--log-dir', CONTAINER_LOG_DIR] cmd.append(CONTAINER_IMAGE) cmd += remaining_args