Merge pull request #51 from webitup/master

Support the "-rm" parameter for the build method
This commit is contained in:
Joffrey F 2013-09-30 08:47:25 -07:00
commit 3288e9f9b0
2 changed files with 3 additions and 3 deletions

View File

@ -10,7 +10,7 @@ API
Client class. `base_url` refers to the protocol+hostname+port where the docker
server is hosted. Version is the version of the API the client will use.
* `c.build(path=None, tag=None, quiet=False, fileobj=None, nocache=False)`
* `c.build(path=None, tag=None, quiet=False, fileobj=None, nocache=False, rm=False)`
Similar to the `docker build` command. Either `path` or `fileobj` needs to be
set. `path` can be a local path (to a directory containing a Dockerfile) or a
remote URL. `fileobj` must be a readable file-like object to a Dockerfile.

View File

@ -166,7 +166,7 @@ class Client(requests.Session):
else:
break
def build(self, path=None, tag=None, quiet=False, fileobj=None, nocache=False):
def build(self, path=None, tag=None, quiet=False, fileobj=None, nocache=False, rm=False):
remote = context = headers = None
if path is None and fileobj is None:
raise Exception("Either path or fileobj needs to be provided.")
@ -180,7 +180,7 @@ class Client(requests.Session):
context = utils.tar(path)
u = self._url('/build')
params = { 't': tag, 'remote': remote, 'q': quiet, 'nocache': nocache }
params = { 't': tag, 'remote': remote, 'q': quiet, 'nocache': nocache, 'rm': rm }
if context is not None:
headers = { 'Content-Type': 'application/tar' }
res = self._result(self.post(u, context, params=params,