From 43cbe3095b8e8996e3acb3a136b69b81b47491b4 Mon Sep 17 00:00:00 2001 From: Romain Lalaut Date: Wed, 27 Jan 2021 15:16:35 +0100 Subject: [PATCH] docker.py: allow docker versions beginning with 'v' (#76) * docker.py: allow docker versions with a leading 'v' * Update changelogs/fragments/76-leading-v-support-in-docker-version.yml Co-authored-by: Felix Fontein Co-authored-by: Felix Fontein --- .../fragments/76-leading-v-support-in-docker-version.yml | 2 ++ plugins/connection/docker.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/76-leading-v-support-in-docker-version.yml diff --git a/changelogs/fragments/76-leading-v-support-in-docker-version.yml b/changelogs/fragments/76-leading-v-support-in-docker-version.yml new file mode 100644 index 00000000..5ac004d3 --- /dev/null +++ b/changelogs/fragments/76-leading-v-support-in-docker-version.yml @@ -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). diff --git a/plugins/connection/docker.py b/plugins/connection/docker.py index 5dcfe55f..71e00761 100644 --- a/plugins/connection/docker.py +++ b/plugins/connection/docker.py @@ -120,7 +120,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 = []