From 99c82b5ed522f8a8145159caeec29ded71416b0c Mon Sep 17 00:00:00 2001 From: Julian Euler Date: Wed, 26 Jan 2022 18:01:53 +0100 Subject: [PATCH] automatic arch detection for compose --- defaults/main.yml | 1 - tasks/docker-compose.yml | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 932aeac..f2e16a9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,7 +12,6 @@ docker_restart_handler_state: restarted # Docker Compose options. docker_install_compose: true docker_compose_version: "1.26.0" -docker_compose_arch: x86_64 docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-{{ docker_compose_arch }}" docker_compose_path: /usr/local/bin/docker-compose diff --git a/tasks/docker-compose.yml b/tasks/docker-compose.yml index 335554d..3d8ea8c 100644 --- a/tasks/docker-compose.yml +++ b/tasks/docker-compose.yml @@ -6,6 +6,10 @@ changed_when: false failed_when: false +- 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 }}"