mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-13 20:40:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only --pull on initial docker build

Browse Source
This commit is contained in:
Anthony Sottile
2017-01-04 11:27:40 -08:00
parent 6046b8bd7e
commit e022bc6735
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pre_commit/languages/docker.py
View File

@@ -39,13 +39,16 @@ def assert_docker_available():
)
def build_docker_image(repo_cmd_runner):
def build_docker_image(repo_cmd_runner, **kwargs):
pull = kwargs.pop('pull')
assert not kwargs, kwargs
cmd = (
'docker', 'build', '--pull',
'docker', 'build', '.',
'--tag', docker_tag(repo_cmd_runner),
'--label', PRE_COMMIT_LABEL,
'.'
)
if pull:
cmd += ('--pull',)
helpers.run_setup_cmd(repo_cmd_runner, cmd)
@@ -62,21 +65,22 @@ def install_environment(
)
assert_docker_available()
directory = helpers.environment_dir(ENVIRONMENT_DIR, 'default')
os.mkdir(repo_cmd_runner.path(directory))
directory = repo_cmd_runner.path(helpers.environment_dir(
ENVIRONMENT_DIR, 'default',
))
# Docker doesn't really have relevant disk environment, but pre-commit
# still needs to cleanup it's state files on failure
env_dir = repo_cmd_runner.path(directory)
with clean_path_on_failure(env_dir):
build_docker_image(repo_cmd_runner)
with clean_path_on_failure(directory):
build_docker_image(repo_cmd_runner, pull=True)
os.mkdir(directory)
def run_hook(repo_cmd_runner, hook, file_args):
assert_docker_available()
# 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)
build_docker_image(repo_cmd_runner, pull=False)
cmd = (
'docker', 'run',
'--rm',