🐛 fix how docker-compose is installed to use the correct user

EuroPython · Aug 8, 2018 · ba92dbe · ba92dbe
1 parent a811039
commit ba92dbe
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 22 deletions.
diff --git 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
diff --git 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