From e47aaa5f7ec10b98f7fa824763ec3b7bf2ada461 Mon Sep 17 00:00:00 2001
From: Janik von Rotz <login@janikvonrotz.ch>
Date: Wed, 1 Sep 2021 19:41:20 +0200
Subject: [PATCH] [docker-compose] update module

---
 README.md                                     |  2 +-
 inventories                                   |  2 +-
 localhost.yml                                 |  2 ++
 roles/clean/tasks/docker-compose.yml          |  5 +++++
 roles/clean/tasks/main.yml                    |  3 ++-
 roles/docker-compose/README.md                |  2 +-
 roles/docker-compose/tasks/docker-compose.yml | 18 +++++-------------
 7 files changed, 17 insertions(+), 17 deletions(-)
 create mode 100644 roles/clean/tasks/docker-compose.yml

diff --git a/README.md b/README.md
index c91b44d9..04fa87dc 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ Role details:
 | [clean](roles/clean/README.md)                                         | Cleanup Ansible roles.                                           |
 | [commento](roles/commento/README.md)                                   | Deploy Commento container.                                       |
 | [debug](roles/debug/README.md)                                         | Debug Ansible variables.                                         |
+| * [docker-compose](roles/docker-compose/README.md)                     | Deploy Docker Compose project.                                   |
 | [docker-network](roles/docker-network/README.md)                       | Configure Docker network.                                        |
 | [docker-volume](roles/docker-volume/README.md)                         | Configure Docker volume.                                         |
 | [docker-swarm](roles/docker-swarm/README.md)                           | Configure Docker Swarm.                                          |
@@ -70,7 +71,6 @@ Role details:
 
 WIP:
 
-* [docker-compose](roles/docker-compose/README.md) - Deploy Docker Compose project.
 * [synapse](roles/synapse/README.md) - Deploy Matrix Synapse container.
 * [coturn](roles/coturn/README.md) - Deploy Coturn container.
 * [collabora-code](roles/collabora-code/README.md) - Deploy Collabora Code container.
diff --git a/inventories b/inventories
index 9f56b32f..4d4a59a1 160000
--- a/inventories
+++ b/inventories
@@ -1 +1 @@
-Subproject commit 9f56b32f4745461f68a06d222696fe81db9cd983
+Subproject commit 4d4a59a12f39843ac7970b478959d3f4f9aa2869
diff --git a/localhost.yml b/localhost.yml
index 817cfb1b..7bd40b14 100644
--- a/localhost.yml
+++ b/localhost.yml
@@ -7,3 +7,5 @@
     tags: odoo-apps
   - role: docker-compose
     tags: docker-compose
+  - role: clean
+    tags: clean
\ No newline at end of file
diff --git a/roles/clean/tasks/docker-compose.yml b/roles/clean/tasks/docker-compose.yml
new file mode 100644
index 00000000..8e38b082
--- /dev/null
+++ b/roles/clean/tasks/docker-compose.yml
@@ -0,0 +1,5 @@
+- name: "Remove docker-compose project"
+  command:  "docker-compose -p {{ docker_compose_project_name }} down -v"
+  args:
+    chdir: "{{ docker_compose_data_dir }}"
+  register: result
\ No newline at end of file
diff --git a/roles/clean/tasks/main.yml b/roles/clean/tasks/main.yml
index c68063f9..d76798a1 100644
--- a/roles/clean/tasks/main.yml
+++ b/roles/clean/tasks/main.yml
@@ -31,4 +31,5 @@
       - pgadmin
       - restic-client
       - commento
-      - bigbluebutton
\ No newline at end of file
+      - bigbluebutton
+      - docker-compose
diff --git a/roles/docker-compose/README.md b/roles/docker-compose/README.md
index 7a818fb1..f6d88b2f 100644
--- a/roles/docker-compose/README.md
+++ b/roles/docker-compose/README.md
@@ -13,7 +13,7 @@ docker_compose_project_name: project01
 docker_compose_data_dir: /usr/share/compose01 # default: "/usr/share/{{ docker_compose_project_name }}"
 docker_compose_dotenv: |
   FRAPPE_VERSION: v13
-  ETSENCRYPT_EMAIL: email@example.com
+  LETSENCRYPT_EMAIL: email@example.com
   POSTGRES_HOST=postgresql
   POSTGRES_PASSWORD=frappe
   SITE_NAME=mysite.localhost
diff --git a/roles/docker-compose/tasks/docker-compose.yml b/roles/docker-compose/tasks/docker-compose.yml
index 01542d3d..701c8e1b 100644
--- a/roles/docker-compose/tasks/docker-compose.yml
+++ b/roles/docker-compose/tasks/docker-compose.yml
@@ -12,19 +12,11 @@
 - name: "Copy {{ role_name }} config"
   template:
     src: docker-compose.yml
-    dest: "{{ docker_compose_data_dir }}/.env"
+    dest: "{{ docker_compose_data_dir }}/docker-compose.yml"
   notify: Restart {{ role_name }} project
 
 - name: "Start {{ role_name }} project"
-  docker_compose:
-    project_name: "{{ docker_compose_project_name }}"
-    project_src: "{{ docker_compose_data_dir }}"
-  register: result
-
-- debug:
-    var: output
-
-# - ansible.builtin.assert:
-#     that:
-#       - "web.flask_web_1.state.running"
-#       - "db.flask_db_1.state.running"
\ No newline at end of file
+  command:  "docker-compose -p {{ docker_compose_project_name }} up -d"
+  args:
+    chdir: "{{ docker_compose_data_dir }}"
+  register: result
\ No newline at end of file