Support docker hooks with args

This commit is contained in:
Ben Picolo 2017-01-05 09:31:22 -05:00
parent 58df7c06e1
commit b7bd825e15
3 changed files with 23 additions and 3 deletions

View file

@ -81,14 +81,17 @@ def run_hook(repo_cmd_runner, hook, file_args):
# Rebuild the docker image in case it has gone missing, as many people do
# automated cleanup of docker images.
build_docker_image(repo_cmd_runner, pull=False)
entry_parts = hook['entry'].split(' ')
entry_executable, entry_args = entry_parts[0], entry_parts[1:]
cmd = (
'docker', 'run',
'--rm',
'-u', '{}:{}'.format(os.getuid(), os.getgid()),
'-v', '{}:/src:rw'.format(os.getcwd()),
'--workdir', '/src',
'--entrypoint', hook['entry'],
'--entrypoint', entry_executable,
docker_tag(repo_cmd_runner)
)
return xargs(cmd + tuple(hook['args']), file_args)
return xargs(cmd + tuple(entry_args) + tuple(hook['args']), file_args)