Refactored docker-compose roles

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

@@ -3,7 +3,7 @@ services:
     image: taigaio/taiga-back:latest
     environment:
       CELERY_ENABLED: "False"
-{% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
+{% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
     entrypoint: "python manage.py"
     volumes:

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

@@ -1,7 +1,7 @@
-services:
-{% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
+{% include 'roles/docker-compose/templates/base.yml.j2' %}
+
   taiga-back:
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
     image: {{taiga_image_backend}}:{{applications.taiga.version}}
     volumes:
       # These volumens will be used by taiga-back and taiga-async.
@@ -17,7 +17,7 @@ services:
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
-{% include 'templates/docker/container/depends-on-also-database.yml.j2' %}
+{% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       taiga-events-rabbitmq:
         condition: service_started
       taiga-async-rabbitmq:
@@ -33,7 +33,7 @@ services:
 
 
   taiga-async:
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
     image: {{taiga_image_backend}}:{{applications.taiga.version}}
     entrypoint: ["/taiga-back/docker/async_entrypoint.sh"]
     volumes:
@@ -52,7 +52,7 @@ services:
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
-{% include 'templates/docker/container/depends-on-also-database.yml.j2' %}
+{% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
       taiga-events-rabbitmq:
         condition: service_started
       taiga-async-rabbitmq:
@@ -71,13 +71,13 @@ services:
     hostname: "taiga-async-rabbitmq"
     volumes:
       - async-rabbitmq-data:/var/lib/rabbitmq
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
 
   taiga-front:
     image: {{taiga_image_frontend}}:{{applications.taiga.version}}
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
 #    volumes:
@@ -85,7 +85,7 @@ services:
 
   taiga-events:
     image: taigaio/taiga-events:latest
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
     depends_on:
@@ -97,14 +97,14 @@ services:
     hostname: "events-rabbitmq"
     volumes:
       - events-rabbitmq-data:/var/lib/rabbitmq
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
 
   taiga-protected:
     image: taigaio/taiga-protected:latest
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -117,7 +117,7 @@ services:
       - {{docker_repository_path}}taiga-gateway/taiga.conf:/etc/nginx/conf.d/default.conf
       - static-data:/taiga/static
       - media-data:/taiga/media
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
 
 {% include 'templates/docker/container/networks.yml.j2' %}
       taiga:
@@ -133,4 +133,4 @@ services:
   events-rabbitmq-data:
 
 {% include 'templates/docker/compose/networks.yml.j2' %}
-  taiga:
+  taiga:

roles/docker-taiga/vars/configuration.yml

@@ -12,7 +12,10 @@ features:
   portfolio_iframe:   false
   oidc:               false
   central_database:   true
-
+docker:
+  services:
+    database:
+      enabled: true
 csp:
   flags:
     script-src-elem:
@@ -21,7 +24,7 @@ csp:
     style-src:
       unsafe-inline: true
     script-src:
-      unsafe-eval:    true
+      unsafe-eval:   true
 domains:
   canonical:
     - "kanban.{{ primary_domain }}"