internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-03-27 05:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport of https://github.com/ansible-collections/community.docker/pull/76 to stable-1. (#1689)

Browse Source
This commit is contained in:
Felix Fontein
2021-01-27 19:56:10 +01:00
committed by GitHub
parent 65861d3482
commit 6f1e585da5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/community.docker-76-leading-v-support-in-docker-version.yml Normal file
View File

@@ -0,0 +1,2 @@
bugfixes:
- docker connection plugin - fix Docker version parsing, as some docker versions have a leading ``v`` in the output of the command ``docker version --format "{{.Server.Version}}"`` (https://github.com/ansible-collections/community.docker/pull/76).

4
plugins/connection/docker.py
View File

@@ -116,7 +116,9 @@ class Connection(ConnectionBase):
@staticmethod
def _sanitize_version(version):
return re.sub(u'[^0-9a-zA-Z.]', u'', version)
version = re.sub(u'[^0-9a-zA-Z.]', u'', version)
version = re.sub(u'^v', u'', version)
return version
def _old_docker_version(self):
cmd_args = []