Mirrors/geerlingguy.ansible-role-docker
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-docker.git synced 2024-11-18 19:10:43 +01:00
Code Issues Projects Releases Wiki Activity

Attempt to fix some Docker compose version comparison bugs.

Browse Source
This commit is contained in:
Jeff Geerling 2022-04-04 10:32:17 -05:00
parent 48d5a077d5
commit cef4b7892e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasks/docker-compose.yml
View File

@ -8,15 +8,15 @@
- set_fact: - set_fact:
docker_compose_current_version: "{{ docker_compose_vsn.stdout | regex_search('(\\d+(\\.\\d+)+)') }}" docker_compose_current_version: "{{ docker_compose_vsn.stdout | regex_search('(\\d+(\\.\\d+)+)') }}"
when: when: docker_compose_vsn.stdout is defined
- docker_compose_vsn.stdout is defined
- name: Delete existing docker-compose version if it's different. - name: Delete existing docker-compose version if it's different.
file: file:
path: "{{ docker_compose_path }}" path: "{{ docker_compose_path }}"
state: absent state: absent
when: > when: >
docker_compose_current_version.stdout is defined docker_compose_current_version.stdout is defined
and docker_compose_version not in docker_compose_current_version.stdout and (docker_compose_version | regex_replace('v', '')) not in docker_compose_current_version.stdout
- name: Install Docker Compose (if configured). - name: Install Docker Compose (if configured).
get_url: get_url:
@ -26,4 +26,4 @@
when: > when: >
(docker_compose_current_version is not defined) (docker_compose_current_version is not defined)
or (docker_compose_current_version|length == 0) or (docker_compose_current_version|length == 0)
or (docker_compose_current_version is version(docker_compose_version, '<')) or (docker_compose_current_version is version((docker_compose_version | regex_replace('v', '')), '<'))