Merge branch 'master' of https://github.com/dimaspivak/docker-py into dimaspivak-master

This commit is contained in:
Joffrey F 2016-03-23 12:04:09 -07:00
commit 9505b3e8b5
3 changed files with 6 additions and 3 deletions

View File

@ -40,13 +40,14 @@ class ContainerApiMixin(object):
@utils.check_resource
def commit(self, container, repository=None, tag=None, message=None,
author=None, conf=None):
author=None, changes=None, conf=None):
params = {
'container': container,
'repo': repository,
'tag': tag,
'comment': message,
'author': author
'author': author,
'changes': changes
}
u = self._url("/commit")
return self._result(self._post_json(u, data=conf, params=params),

View File

@ -123,6 +123,7 @@ Identical to the `docker commit` command.
* tag (str): The tag to push
* message (str): A commit message
* author (str): The name of the author
* changes (str): Dockerfile instructions to apply while committing
* conf (dict): The configuration for the container. See the [Docker remote api](
https://docs.docker.com/reference/api/docker_remote_api/) for full details.

View File

@ -101,7 +101,8 @@ class ImageTest(DockerClientTest):
'comment': None,
'tag': None,
'container': '3cc2351ab11b',
'author': None
'author': None,
'changes': None
},
timeout=DEFAULT_TIMEOUT_SECONDS
)