From 61c0edbd8899c994f0cf97938f992e3f1a9479bb Mon Sep 17 00:00:00 2001 From: Jannik Beyerstedt Date: Sun, 19 Apr 2020 20:19:20 +0200 Subject: [PATCH] [FIX] docker: detect armv7 correctly, add better guard fpr x86_64 --- tasks/docker-Debian.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tasks/docker-Debian.yml b/tasks/docker-Debian.yml index f5db911..4d0d8d2 100644 --- a/tasks/docker-Debian.yml +++ b/tasks/docker-Debian.yml @@ -56,7 +56,7 @@ - name: docker-compose - Discover if ARM is used set_fact: dockercompose_use_pip: true - when: ansible_architecture == "aarch64" or ansible_architecture == "armv7f" + when: ansible_architecture == "aarch64" or ansible_architecture == "armv7l" - name: docker-compose - Install x86_46 binary block: @@ -79,7 +79,7 @@ file: path: /usr/local/bin/docker-compose mode: 0755 - when: dockercompose_use_pip == false + when: dockercompose_use_pip == false and ansible_architecture == "x86_64" - name: docker-compose - Install python package block: - name: docker-compose - Install requirements @@ -96,3 +96,4 @@ pip: name: docker-compose executable: pip3 + when: dockercompose_use_pip == true