docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pullfix' of https://github.com/glogiotatidis/docker-py into glogiotatidis-pullfix 

Conflicts:
	docker/client.py
This commit is contained in:
Joffrey F 2015-06-19 01:26:49 +02:00
parent ed07b053e9 739d875854
commit cf06837002
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/client.py
View File

@ -306,7 +306,7 @@ class Client(requests.Session):
def build(self, path=None, tag=None, quiet=False, fileobj=None, def build(self, path=None, tag=None, quiet=False, fileobj=None,
nocache=False, rm=False, stream=False, timeout=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, forcerm=False, dockerfile=None, container_limits=None,
decode=False): decode=False):
remote = context = headers = None remote = context = headers = None
@ -353,6 +353,9 @@ class Client(requests.Session):
'dockerfile was only introduced in API version 1.17' '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') u = self._url('/build')
params = { params = {
't': tag, 't': tag,