internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some breaks after merging ansible/devel

Browse Source
This commit is contained in:
Thomas Steinbach
2016-03-24 22:09:41 +01:00
parent cd2c140f69
commit 870160b8ed
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/ansible/plugins/connection/docker.py
View File

@@ -68,10 +68,10 @@ class Connection(ConnectionBase):
# root.
if 'docker_command' in kwargs:
self.docker_cmd = [kwargs['docker_command']]
self.docker_cmd = kwargs['docker_command']
else:
self.docker_cmd = [distutils.spawn.find_executable('docker')]
if not self.docker_cmd[0]:
self.docker_cmd = distutils.spawn.find_executable('docker')
if not self.docker_cmd:
raise AnsibleError("docker command not found in PATH")
docker_version = self._get_docker_version()
@@ -106,7 +106,13 @@ class Connection(ConnectionBase):
def _get_docker_version(self):
cmd = self.docker_cmd + ['version']
cmd = [self.docker_cmd]
if self._play_context.docker_extra_args:
cmd += self._play_context.docker_extra_args.split(' ')
cmd += ['version']
cmd_output = subprocess.check_output(cmd)
for line in cmd_output.split('\n'):
@@ -114,7 +120,10 @@ class Connection(ConnectionBase):
return self._sanitize_version(line.split()[2])
# no result yet, must be newer Docker version
new_docker_cmd = self.docker_cmd + ['version', '--format', "'{{.Server.Version}}'"]
new_docker_cmd = [
self.docker_cmd,
'version', '--format', "'{{.Server.Version}}'"
]
cmd_output = subprocess.check_output(new_docker_cmd)