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 'master' into 0.6.0-release

This commit is contained in:
Joffrey F 2014-11-03 20:50:13 +01:00
parent 8ea385eb21 4c5cfc4800
commit 0ff92f5f12
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/client.py
View File

@ -877,6 +877,8 @@ class Client(requests.Session):
self._raise_for_status(res)
def remove_image(self, image, force=False, noprune=False):
if isinstance(image, dict):
image = image.get('Id')
params = {'force': force, 'noprune': noprune}
res = self._delete(self._url("/images/" + image), params=params)
self._raise_for_status(res)

6
tests/utils_test.py
View File

@ -72,9 +72,9 @@ class UtilsTest(unittest.TestCase):
DOCKER_TLS_VERIFY='1')
kwargs = kwargs_from_env(assert_hostname=False)
self.assertEquals('https://192.168.59.103:2376', kwargs['base_url'])
self.assertIn('ca.pem', kwargs['tls'].verify)
self.assertIn('cert.pem', kwargs['tls'].cert[0])
self.assertIn('key.pem', kwargs['tls'].cert[1])
self.assertTrue('ca.pem' in kwargs['tls'].verify)
self.assertTrue('cert.pem' in kwargs['tls'].cert[0])
self.assertTrue('key.pem' in kwargs['tls'].cert[1])
self.assertEquals(False, kwargs['tls'].assert_hostname)
try:
client = Client(**kwargs)