use python2 docker-compose

This commit is contained in:
Robert Kaussow 2020-06-14 19:28:34 +02:00
parent c95457c4d4
commit cefdcc91ff
Signed by: xoxys
GPG Key ID: 65362AE74AF98B61
5 changed files with 15 additions and 22 deletions

View File

@ -3,14 +3,11 @@ dockerengine_packages:
- docker - docker
# @var dockerengine_packages_extra:description: > # @var dockerengine_packages_extra:description: >
# The role requires epel repository and pip to work .You can use # The role requires epel repository and pip to work. You can use
# `dockerengine_packages_extra` to install these dependencys. # `dockerengine_packages_extra` to install these dependencys.
# @end # @end
dockerengine_packages_extra: [] dockerengine_packages_extra: []
dockerengine_packages_python:
- name: docker-compose
dockerengine_service: docker dockerengine_service: docker
dockerengine_docker_group_enabled: False dockerengine_docker_group_enabled: False

View File

@ -1,6 +1,10 @@
--- ---
- name: Converge - name: Converge
hosts: all hosts: all
vars:
dockerengine_packages_extra:
- epel-release
- python-pip
roles: roles:
- role: xoxys.python3
- role: xoxys.docker_engine - role: xoxys.docker_engine

View File

@ -1,5 +0,0 @@
---
- src: https://gitea.rknet.org/ansible/xoxys.python3.git
name: xoxys.python3
scm: git
version: master

View File

@ -1,24 +1,20 @@
--- ---
- block: - block:
- name: Install dependencies - name: Install dependencies
package: package:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
loop: "{{ dockerengine_packages_extra }}" loop: "{{ dockerengine_packages_extra }}"
- name: Install python dependencies
pip:
name: "{{ item }}"
loop: "{{ __docker_ansible_deps }}"
- name: Install packages - name: Install packages
package: package:
name: "{{ item }}" name: "{{ item }}"
state: present state: present
loop: "{{ dockerengine_packages + __docker_ansible_deps }}" loop: "{{ dockerengine_packages }}"
- name: Install python packages
pip:
name: "{{ item.name }}"
executable: "{{ item.exec | default('/usr/bin/pip3') }}"
state: present
loop: "{{ dockerengine_packages_python }}"
loop_control:
label: "{{ item.name }}"
become: True become: True
become_user: root become_user: root

View File

@ -1,3 +1,4 @@
--- ---
__docker_ansible_deps: __docker_ansible_deps:
- python-docker-py - docker-compose~=1.23.0
- docker