From 1ee14a15388267ba1f3e6844ab6d961dfb8f5385 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 28 May 2014 01:57:59 +0200 Subject: [PATCH 1/2] Updated remove_image and remove_container with new params added in 1.10 --- docker/client.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/client.py b/docker/client.py index f76f0917..0e8832dc 100644 --- a/docker/client.py +++ b/docker/client.py @@ -691,16 +691,17 @@ class Client(requests.Session): return stream and self._stream_helper(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): container = container.get('Id') - params = {'v': v, 'link': link} + params = {'v': v, 'link': link, 'force': force} res = self._delete(self._url("/containers/" + container), params=params) self._raise_for_status(res) - def remove_image(self, image): - res = self._delete(self._url("/images/" + image)) + def remove_image(self, image, force=False, noprune=False): + params = {'force': force, 'noprune': noprune} + res = self._delete(self._url("/images/" + image), params=params) self._raise_for_status(res) def restart(self, container, timeout=10): From c2b259009a17cd2923736d1251cb9a333c9e668b Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 28 May 2014 02:03:10 +0200 Subject: [PATCH 2/2] Updated unit tests --- tests/test.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/test.py b/tests/test.py index 2cffb677..ba1cf9be 100644 --- a/tests/test.py +++ b/tests/test.py @@ -899,7 +899,7 @@ class DockerClientTest(unittest.TestCase): fake_request.assert_called_with( url_prefix + 'containers/3cc2351ab11b', - params={'v': False, 'link': False}, + params={'v': False, 'link': False, 'force': False}, timeout=docker.client.DEFAULT_TIMEOUT_SECONDS ) @@ -911,7 +911,7 @@ class DockerClientTest(unittest.TestCase): fake_request.assert_called_with( url_prefix + 'containers/3cc2351ab11b', - params={'v': False, 'link': False}, + params={'v': False, 'link': False, 'force': False}, timeout=docker.client.DEFAULT_TIMEOUT_SECONDS ) @@ -923,7 +923,7 @@ class DockerClientTest(unittest.TestCase): fake_request.assert_called_with( url_prefix + 'containers/3cc2351ab11b', - params={'v': False, 'link': True}, + params={'v': False, 'link': True, 'force': False}, timeout=docker.client.DEFAULT_TIMEOUT_SECONDS ) @@ -1028,6 +1028,7 @@ class DockerClientTest(unittest.TestCase): fake_request.assert_called_with( url_prefix + 'images/e9aa60c60128', + params={'force': False, 'noprune': False}, timeout=docker.client.DEFAULT_TIMEOUT_SECONDS )