Cadoles
/
Tamarin
21
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity

Fix arguments order

This commit is contained in:
wpetit 2017-07-10 17:29:39 +02:00
parent 17d371c804
commit 7ead22e8ec
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package
View File

@ -64,8 +64,6 @@ if __name__ == "__main__":
parser = create_args_parser() parser = create_args_parser()
args = parser.parse_args() args = parser.parse_args()
print(args.docker_arg)
if args.cleanup: if args.cleanup:
cleanup(debug=args.debug) cleanup(debug=args.debug)
@ -104,6 +102,9 @@ if __name__ == "__main__":
kwargs = dict() kwargs = dict()
kwargs['debug'] = args.debug kwargs['debug'] = args.debug
# Append custom arguments
docker_args += args.docker_arg
if args.debug: if args.debug:
kwargs['pty'] = True kwargs['pty'] = True
docker_args += ["-it", image_tag, "/bin/sh"] docker_args += ["-it", image_tag, "/bin/sh"]
@ -112,9 +113,6 @@ if __name__ == "__main__":
else: else:
docker_args += [image_tag, "/usr/bin/python3", "/tamarin/lib/build.py", args.profile, args.architecture] docker_args += [image_tag, "/usr/bin/python3", "/tamarin/lib/build.py", args.profile, args.architecture]
# Append custom arguments
docker_args += args.docker_arg
# Start container # Start container
tamarin.run_docker(docker_args, **kwargs) tamarin.run_docker(docker_args, **kwargs)