Merge pull request #6991 from joshuaconner/bugfix_dont_send_wrong_params_to_dockerclient_start

Docker: don't send wrong parameters to client.start()
11 years ago · f068a4f26a
parent 3b78b05816 bac2e879b2
commit f068a4f26a
1 changed files with 6 additions and 7 deletions
--- a/cloud/docker
+++ b/cloud/docker
@ -570,8 +570,7 @@ class DockerManager:
            'privileged':   self.module.params.get('privileged'),
            'links': self.links,
        }
-
-        if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0:
+        if docker.utils.compare_version('1.10', self.client.version()['ApiVersion']) >= 0 and hasattr(docker, '__version__') and docker.__version__ > '0.3.0':
            params['dns'] = self.module.params.get('dns')
            params['volumes_from'] = self.module.params.get('volumes_from')