Implemented a new docker compose structure which seperates between docker compose files and environment variable file to protect credentials better. Also did recatoring. Changes not fully tested

roles/docker-akaunting/tasks/main.yml

@@ -6,9 +6,16 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "include tasks update-repository-with-docker-compose.yml"
-  include_tasks: update-repository-with-docker-compose.yml
+- name: "include tasks update-repository-with-files.yml"
+  include_tasks: update-repository-with-files.yml
+  vars:
+    detached_files: 
+      - "docker-compose.yml"
 
-- name: configure run.env
-  template: src=run.env.j2 dest={{docker_compose.directories.instance}}/env/run.env
+- name: "create {{docker_compose.files.env}}"
+  template: 
+    src:  "env.j2" 
+    dest: "{{docker_compose.files.env}}"
+    mode: '770'
+    force: yes
   notify: docker compose project setup

roles/docker-akaunting/templates/docker-compose.yml.j2

@@ -3,6 +3,9 @@ services:
 {% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
 
   application:
+
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+
     image: docker.io/akaunting/akaunting:{{applications.akaunting.version}}
     build:
       context: .
@@ -10,9 +13,6 @@ services:
       - 127.0.0.1:{{http_port}}:80
     volumes:
       - data:/var/www/html
-    restart: {{docker_restart_policy}}
-    env_file:
-      - env/run.env
     environment:
       - AKAUNTING_SETUP
 {% include 'templates/docker/container/networks.yml.j2' %}