From 493acb74ac4634afc0a7b29950d5044475c75386 Mon Sep 17 00:00:00 2001 From: Julian Euler Date: Wed, 26 Jan 2022 17:26:17 +0100 Subject: [PATCH] support for compose v2 --- defaults/main.yml | 4 ++-- tasks/docker-compose.yml | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d75b81f..63ae37d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -11,8 +11,8 @@ docker_restart_handler_state: restarted # Docker Compose options. docker_install_compose: true -docker_compose_version: "1.26.0" -docker_compose_url: https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64 +docker_compose_version: "2.2.3" +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 repo URL. diff --git a/tasks/docker-compose.yml b/tasks/docker-compose.yml index 9a49668..96b13ce 100644 --- a/tasks/docker-compose.yml +++ b/tasks/docker-compose.yml @@ -10,6 +10,16 @@ docker_compose_current_version: "{{ docker_compose_vsn.stdout | regex_search('(\\d+(\\.\\d+)+)') }}" when: - 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. file: path: "{{ docker_compose_path }}"