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

Merge pull request #233 from dotcloud/api_1.10 

remove_image and remove_container : new params
This commit is contained in:
Joffrey F 2014-05-27 17:05:05 -07:00
parent 02f8c5ced0 c2b259009a
commit 3dd8d9eb90
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/client.py
View File

@ -691,16 +691,17 @@ class Client(requests.Session):
return stream and self._stream_helper(response) \ return stream and self._stream_helper(response) \
or self._result(response) or self._result(response)
def remove_container(self, container, v=False, link=False): def remove_container(self, container, v=False, link=False, force=False):
if isinstance(container, dict): if isinstance(container, dict):
container = container.get('Id') container = container.get('Id')
params = {'v': v, 'link': link} params = {'v': v, 'link': link, 'force': force}
res = self._delete(self._url("/containers/" + container), res = self._delete(self._url("/containers/" + container),
params=params) params=params)
self._raise_for_status(res) self._raise_for_status(res)
def remove_image(self, image): def remove_image(self, image, force=False, noprune=False):
res = self._delete(self._url("/images/" + image)) params = {'force': force, 'noprune': noprune}
res = self._delete(self._url("/images/" + image), params=params)
self._raise_for_status(res) self._raise_for_status(res)
def restart(self, container, timeout=10): def restart(self, container, timeout=10):

7
tests/test.py
View File

@ -899,7 +899,7 @@ class DockerClientTest(unittest.TestCase):
fake_request.assert_called_with( fake_request.assert_called_with(
url_prefix + 'containers/3cc2351ab11b', url_prefix + 'containers/3cc2351ab11b',
params={'v': False, 'link': False}, params={'v': False, 'link': False, 'force': False},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -911,7 +911,7 @@ class DockerClientTest(unittest.TestCase):
fake_request.assert_called_with( fake_request.assert_called_with(
url_prefix + 'containers/3cc2351ab11b', url_prefix + 'containers/3cc2351ab11b',
params={'v': False, 'link': False}, params={'v': False, 'link': False, 'force': False},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -923,7 +923,7 @@ class DockerClientTest(unittest.TestCase):
fake_request.assert_called_with( fake_request.assert_called_with(
url_prefix + 'containers/3cc2351ab11b', url_prefix + 'containers/3cc2351ab11b',
params={'v': False, 'link': True}, params={'v': False, 'link': True, 'force': False},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )
@ -1028,6 +1028,7 @@ class DockerClientTest(unittest.TestCase):
fake_request.assert_called_with( fake_request.assert_called_with(
url_prefix + 'images/e9aa60c60128', url_prefix + 'images/e9aa60c60128',
params={'force': False, 'noprune': False},
timeout=docker.client.DEFAULT_TIMEOUT_SECONDS timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
) )