Merge "Checks that docker is installed"

This commit is contained in:
Jenkins 2014-09-09 06:43:08 +00:00 committed by Gerrit Code Review
commit 96eb0af5d8
2 changed files with 15 additions and 0 deletions

View File

@ -15,6 +15,7 @@
import argparse
import logging
import sys
import dox.commands
import dox.config.cmdline
@ -75,6 +76,8 @@ def main():
def run_dox(args):
if not dox.runner.Runner(args).is_docker_installed():
sys.exit(1)
# Get Image
image = args.image

View File

@ -37,6 +37,18 @@ class Runner(object):
self.base_image_name = 'dox_%s_base' % self.project
self.test_image_name = 'dox_%s_test' % self.project
def is_docker_installed(self):
try:
self._docker_cmd("version")
except OSError as e:
msg = 'docker does not seem installed'
if e.errno == 2 and not self.args.debug:
logger.error(msg)
else:
logger.exception(msg)
return False
return True
def _docker_build(self, image, image_dir='.'):
logger.info('Building image %s' % image)
self._docker_cmd('build', '-t', image, image_dir)