Merge pull request #291 from yograterol/master

Volumes parameter on create_container should be validated as string

Author: shin-

docker/client.py

@@ -117,8 +117,8 @@ def _container_config(self, image, command, hostname=None, user=None,
             else:
                 units = {'b': 1,
                          'k': 1024,
-                         'm': 1024*1024,
-                         'g': 1024*1024*1024}
+                         'm': 1024 * 1024,
+                         'g': 1024 * 1024 * 1024}
                 suffix = mem_limit[-1].lower()
 
                 # Check if the variable is a string representation of an int
@@ -158,6 +158,9 @@ def _container_config(self, image, command, hostname=None, user=None,
                 exposed_ports['{0}/{1}'.format(port, proto)] = {}
             ports = exposed_ports
 
+        if isinstance(volumes, six.string_types):
+            volumes = [volumes, ]
+
         if isinstance(volumes, list):
             volumes_dict = {}
             for vol in volumes:
@@ -500,6 +503,9 @@ def create_container(self, image, command=None, hostname=None, user=None,
                          cpu_shares=None, working_dir=None, domainname=None,
                          memswap_limit=0):
 
+        if isinstance(volumes, six.string_types):
+            volumes = [volumes, ]
+
         config = self._container_config(
             image, command, hostname, user, detach, stdin_open, tty, mem_limit,
             ports, environment, dns, volumes, volumes_from, network_disabled,

tests/test.py

@@ -248,6 +248,31 @@ def test_create_container_with_binds(self):
         self.assertEqual(args[1]['headers'],
                          {'Content-Type': 'application/json'})
 
+    def test_create_container_with_volume_string(self):
+        mount_dest = '/mnt'
+
+        try:
+            self.client.create_container('busybox', ['ls', mount_dest],
+                                         volumes=mount_dest)
+        except Exception as e:
+            self.fail('Command should not raise exception: {0}'.format(e))
+
+        args = fake_request.call_args
+        self.assertEqual(args[0][0],
+                         url_prefix + 'containers/create')
+        self.assertEqual(json.loads(args[1]['data']),
+                         json.loads('''
+                            {"Tty": false, "Image": "busybox",
+                             "Cmd": ["ls", "/mnt"], "AttachStdin": false,
+                             "Volumes": {"/mnt": {}}, "Memory": 0,
+                             "AttachStderr": true,
+                             "AttachStdout": true, "OpenStdin": false,
+                             "StdinOnce": false,
+                             "NetworkDisabled": false,
+                             "MemorySwap": 0}'''))
+        self.assertEqual(args[1]['headers'],
+                         {'Content-Type': 'application/json'})
+
     def test_create_container_with_ports(self):
         try:
             self.client.create_container('busybox', 'ls',