mirror of
https://github.com/geerlingguy/ansible-role-docker.git
synced 2025-08-15 13:48:28 +02:00
support for compose v2
This commit is contained in:
parent
bfba781af0
commit
493acb74ac
@ -11,8 +11,8 @@ docker_restart_handler_state: restarted
|
|||||||
|
|
||||||
# Docker Compose options.
|
# Docker Compose options.
|
||||||
docker_install_compose: true
|
docker_install_compose: true
|
||||||
docker_compose_version: "1.26.0"
|
docker_compose_version: "2.2.3"
|
||||||
docker_compose_url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64
|
docker_compose_url: https://github.com/docker/compose/releases/download/{{ docker_compose_version_prefix }}{{ docker_compose_version }}/docker-compose-{{ docker_compose_linux_casing }}-{{ docker_compose_arch }}
|
||||||
docker_compose_path: /usr/local/bin/docker-compose
|
docker_compose_path: /usr/local/bin/docker-compose
|
||||||
|
|
||||||
# Docker repo URL.
|
# Docker repo URL.
|
||||||
|
@ -10,6 +10,16 @@
|
|||||||
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: Set version-specific URL variables
|
||||||
|
set_fact:
|
||||||
|
docker_compose_linux_casing: "{{ (docker_compose_version is version('2', '<')) | ternary('Linux', 'linux') }}"
|
||||||
|
docker_compose_version_prefix: "{{ (docker_compose_version is version('2', '<')) | ternary('', 'v') }}"
|
||||||
|
|
||||||
|
- name: Set architecture
|
||||||
|
set_fact:
|
||||||
|
docker_compose_arch: "{{ (ansible_architecture == 'armv7l') | ternary('armv7', ansible_architecture) }}"
|
||||||
|
|
||||||
- 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 }}"
|
||||||
|
Loading…
Reference in New Issue
Block a user