jannik/ansible-role-server
1
1
Fork 0
Code Issues 3 Releases Activity

[FIX] docker: detect armv7 correctly, add better guard fpr x86_64

Browse source
This commit is contained in:
Jannik Beyerstedt 2020-04-19 20:19:20 +02:00
parent 91d7887a94
commit 61c0edbd88
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tasks/docker-Debian.yml
View file

@ -56,7 +56,7 @@
- name: docker-compose - Discover if ARM is used - name: docker-compose - Discover if ARM is used
set_fact: set_fact:
dockercompose_use_pip: true 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 - name: docker-compose - Install x86_46 binary
block: block:
@ -79,7 +79,7 @@
file: file:
path: /usr/local/bin/docker-compose path: /usr/local/bin/docker-compose
mode: 0755 mode: 0755
when: dockercompose_use_pip == false when: dockercompose_use_pip == false and ansible_architecture == "x86_64"
- name: docker-compose - Install python package - name: docker-compose - Install python package
block: block:
- name: docker-compose - Install requirements - name: docker-compose - Install requirements
@ -96,3 +96,4 @@
pip: pip:
name: docker-compose name: docker-compose
executable: pip3 executable: pip3
when: dockercompose_use_pip == true