openstack
/
kolla
Code Issues Proposed changes

Merge "build with --template-only to not require running docker service"

This commit is contained in:
Zuul 2018-07-27 08:32:33 +00:00 committed by Gerrit Code Review
parent 4c4289eff9 9cc7667a51
commit d7cd35ff9a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kolla/image/build.py
View File

@ -710,7 +710,12 @@ class KollaWorker(object):
self.maintainer = conf.maintainer
docker_kwargs = docker.utils.kwargs_from_env()
self.dc = docker.APIClient(version='auto', **docker_kwargs)
try:
self.dc = docker.APIClient(version='auto', **docker_kwargs)
except docker.errors.DockerException as e:
self.dc = None
if not conf.template_only:
raise e
def _get_images_dir(self):
possible_paths = (