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-taiga/tasks/main.yml

@@ -10,6 +10,6 @@
   include_tasks: update-repository-with-files.yml
   vars:
     detached_files: 
-      - .env
-      - docker-compose.yml
-      - docker-compose-inits.yml
+      - "{{docker_compose.directories.env}}env"
+      - "{{docker_compose.directories.instance}}docker-compose.yml"
+      - "{{docker_compose.directories.instance}}docker-compose-inits.yml"

roles/docker-taiga/templates/docker-compose-inits.yml.j2

@@ -32,6 +32,7 @@ services:
   taiga-manage:
     image: taigaio/taiga-back:latest
     environment: *default-back-environment
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
 {% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
 

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

@@ -38,16 +38,12 @@ x-volumes:
 services:
 {% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
   taiga-back:
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     image: taigaio/taiga-back:{{applications.taiga.version}}
     environment: *default-back-environment
     volumes: *default-back-volumes
-
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
-
 {% include 'templates/docker/container/depends-on-also-database.yml.j2' %}
       taiga-events-rabbitmq:
         condition: service_started
@@ -55,9 +51,7 @@ services:
         condition: service_started
 
   taiga-async:
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     image: taigaio/taiga-back:latest
     entrypoint: ["/taiga-back/docker/async_entrypoint.sh"]
     environment: *default-back-environment
@@ -82,9 +76,7 @@ services:
     hostname: "taiga-async-rabbitmq"
     volumes:
       - async-rabbitmq-data:/var/lib/rabbitmq
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -95,10 +87,7 @@ services:
       TAIGA_URL: "${TAIGA_SCHEME}://${TAIGA_DOMAIN}"
       TAIGA_WEBSOCKETS_URL: "${WEBSOCKETS_SCHEME}://${TAIGA_DOMAIN}"
       TAIGA_SUBPATH: "${SUBPATH}"
-      # ...your customizations go here
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -111,10 +100,7 @@ services:
       RABBITMQ_USER: "${RABBITMQ_USER}"
       RABBITMQ_PASS: "${RABBITMQ_PASS}"
       TAIGA_SECRET_KEY: "${SECRET_KEY}"
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
-
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
     depends_on:
@@ -131,9 +117,7 @@ services:
     hostname: "events-rabbitmq"
     volumes:
       - events-rabbitmq-data:/var/lib/rabbitmq
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -143,9 +127,7 @@ services:
     environment:
       MAX_AGE: "${ATTACHMENTS_MAX_AGE}"
       SECRET_KEY: "${SECRET_KEY}"
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -158,9 +140,7 @@ services:
       - ./taiga-gateway/taiga.conf:/etc/nginx/conf.d/default.conf
       - static-data:/taiga/static
       - media-data:/taiga/media
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga: