aboutsummaryrefslogtreecommitdiff
path: root/kolla/cmd
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-03 11:39:43 +0000
committerGerrit Code Review <review@openstack.org>2015-12-03 11:39:43 +0000
commitc21ac636912615624fc1ef4f75ba58a795d81aa2 (patch)
tree642ca972bee67c0dd5541dde219aa90ca14d377d /kolla/cmd
parentc3906fabbab090053a70e2b87a77fcc6a4f58d4a (diff)
parentdc2ad7d134e5ed14cc0b3015313b48847a7b9b00 (diff)
downloadkolla-c21ac636912615624fc1ef4f75ba58a795d81aa2.tar.gz
kolla-c21ac636912615624fc1ef4f75ba58a795d81aa2.zip
Merge "Set docker api version to auto"
Diffstat (limited to 'kolla/cmd')
-rwxr-xr-xkolla/cmd/build.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py
index 79e674c25..eea857a22 100755
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@@ -51,6 +51,11 @@ class KollaUnknownBuildTypeException(Exception):
pass
+def docker_client():
+ docker_kwargs = docker.utils.kwargs_from_env()
+ return docker.Client(version='auto', **docker_kwargs)
+
+
class WorkerThread(Thread):
def __init__(self, queue, config):
@@ -58,7 +63,7 @@ class WorkerThread(Thread):
self.nocache = config['no_cache']
self.forcerm = not config['keep']
self.retries = config['retries']
- self.dc = docker.Client(**docker.utils.kwargs_from_env())
+ self.dc = docker_client()
super(WorkerThread, self).__init__()
def end_task(self, image):
@@ -581,7 +586,7 @@ class KollaWorker(object):
def push_image(image):
- dc = docker.Client(**docker.utils.kwargs_from_env())
+ dc = docker_client()
image['push_logs'] = str()
for response in dc.push(image['fullname'],