summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-06-19 01:27:04 +0200
committerJoffrey F <joffrey@docker.com>2015-06-19 01:27:04 +0200
commite5485fb24f70c023c2ca92911a32785c0301067f (patch)
tree6ee123064b4ea7dd5dda769f5f6de17accb75d00
parented07b053e92c11d22226782a1e5482e6c93a7bcf (diff)
parentcf06837002fe01985be78209dd0c0491ff65ab3d (diff)
downloaddocker-py-e5485fb24f70c023c2ca92911a32785c0301067f.tar.gz
Merge branch 'glogiotatidis-pullfix'
-rw-r--r--docker/client.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/client.py b/docker/client.py
index c73e560..5781db6 100644
--- a/docker/client.py
+++ b/docker/client.py
@@ -306,7 +306,7 @@ class Client(requests.Session):
def build(self, path=None, tag=None, quiet=False, fileobj=None,
nocache=False, rm=False, stream=False, timeout=None,
- custom_context=False, encoding=None, pull=True,
+ custom_context=False, encoding=None, pull=False,
forcerm=False, dockerfile=None, container_limits=None,
decode=False):
remote = context = headers = None
@@ -353,6 +353,9 @@ class Client(requests.Session):
'dockerfile was only introduced in API version 1.17'
)
+ if utils.compare_version('1.19', self._version) < 0:
+ pull = 1 if pull else 0
+
u = self._url('/build')
params = {
't': tag,