Merge "build with --template-only to not require running docker service"
This commit is contained in:
commit
d7cd35ff9a
|
@ -710,7 +710,12 @@ class KollaWorker(object):
|
||||||
self.maintainer = conf.maintainer
|
self.maintainer = conf.maintainer
|
||||||
|
|
||||||
docker_kwargs = docker.utils.kwargs_from_env()
|
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):
|
def _get_images_dir(self):
|
||||||
possible_paths = (
|
possible_paths = (
|
||||||
|
|
Loading…
Reference in New Issue