From ba92dbeb0496b32214d78267a13826007b71c318 Mon Sep 17 00:00:00 2001
From: "Alexandre M. Savio" <alexsavio@gmail.com>
Date: Wed, 8 Aug 2018 23:02:30 +0200
Subject: [PATCH] :bug: fix how docker-compose is installed to use the correct
 user

---
 playbook.yml                                  |  4 +--
 .../tasks/install_docker_compose.yml          | 17 ------------
 roles/docker-compose/tasks/main.yml           | 26 ++++++++++++++++---
 3 files changed, 25 insertions(+), 22 deletions(-)
 delete mode 100644 roles/docker-compose/tasks/install_docker_compose.yml

diff --git a/playbook.yml b/playbook.yml
index 57cac49..c1b6c62 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -5,5 +5,5 @@
   any_errors_fatal: true
   roles:
     - { role: common, become: yes, become_method: sudo, tags: common }
-    - { role: docker-compose, become: yes, become_method: sudo, tags: python }
-    - { role: epcon-apps, tags: docker_apps }
+    - { role: docker-compose, tags: docker }
+    - { role: epcon-apps, tags: apps }
diff --git a/roles/docker-compose/tasks/install_docker_compose.yml b/roles/docker-compose/tasks/install_docker_compose.yml
deleted file mode 100644
index 829f098..0000000
--- a/roles/docker-compose/tasks/install_docker_compose.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-
-- name: Install dependencies
-  apt:
-    name:
-    - build-essential
-    - libssl-dev
-    update_cache: yes
-    cache_valid_time: 3600
-  become: yes
-  become_method: sudo
-
-- name: Install docker-compose
-  pip:
-    name: docker-compose
-    extra_args: --user
-    version: 1.22.0
diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index b38a5a0..a340c66 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -3,7 +3,27 @@
 - import_tasks: install_docker.yml
   become: yes
   become_method: sudo
-  tags: [docker, docker_compose]
+  tags: docker
 
-- import_tasks: install_docker_compose.yml
-  tags: [docker, docker_compose]
+- name: Install docker-compose dependencies
+  apt:
+    name:
+    - build-essential
+    - libssl-dev
+    update_cache: yes
+    cache_valid_time: 3600
+  become: yes
+  become_method: sudo
+  tags: docker_compose
+
+- name: Install docker-compose
+  pip:
+    name: docker-compose
+    extra_args: --user
+    version: 1.22.0
+
+- name: Install docker Python module
+  pip:
+    name: docker
+    extra_args: --user
+    version: 3.4.1