openstack/kolla
Code Issues Proposed changes

Allow running more commands dockerless

Browse Source 
The `--save-dependency`, `--list-images`, and `--list-dependencies`
options to the kolla-build commands do not actually require docker
daemon running. This commit stop kolla-build from complaining when it is
called with one of the above options without docker daemon started.

Change-Id: I966587236aca363316db8abbfc04763655b4b68f
This commit is contained in:
Martin André 2019-01-30 18:47:22 +01:00
parent 1d6817e181
commit ab942509e5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kolla/image/build.py
View File

@ -740,7 +740,10 @@ class KollaWorker(object):
self.dc = docker.APIClient(version='auto', **docker_kwargs) self.dc = docker.APIClient(version='auto', **docker_kwargs)
except docker.errors.DockerException as e: except docker.errors.DockerException as e:
self.dc = None self.dc = None
if not conf.template_only: if not (conf.template_only
or conf.save_dependency
or conf.list_images
or conf.list_dependencies):
raise e raise e
def _get_images_dir(self): def _get_images_dir(self):