Refactored docker-compose roles

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

@@ -0,0 +1,15 @@
+{# Base template for all docker-compose.yml.j2 #}
+services:
+{# Load Database #}
+{% if applications[application_id].docker.database.enabled | default(false) | bool %}
+{% include 'roles/docker-central-database/templates/services/main.yml.j2' %}
+{% endif %}
+{# Load Redis #}
+{% if applications[application_id].docker.redis.enabled | default(false) | bool %}
+{% include 'templates/docker/services/redis.yml.j2' %}
+{% endif %}
+{# Load OAuth2 Proxy #}
+{% if not applications | is_feature_enabled('oauth2',application_id) %}
+{% include 'roles/docker-oauth2-proxy/templates/container.yml.j2' %}
+{% endif %}
+{{ "\n" }}

roles/docker-compose/templates/services/base.yml.j2

@@ -1,9 +0,0 @@
-{# Base for docker services #}
-
-    restart: {{docker_restart_policy}}
-    env_file:
-      - "{{docker_compose.files.env}}"
-    logging:
-      driver: journald
-
-{{ "\n" }}

roles/docker-compose/templates/services/msmtp_curl_test.yml.j2

@@ -1,24 +0,0 @@
-  
-{#
-  This health check ensures the test email is sent only once to prevent
-  hitting SMTP rate limits due to multiple health check executions.
-  The logic checks for a temporary file (/tmp/email_sent) to determine
-  if the email has already been sent. If the file exists, the email
-  is skipped, but the health check continues by verifying the HTTP service.
-  Refer to the conversation with ChatGPT (https://chatgpt.com/share/67898c3f-2c1c-800f-861c-47dcbe109135)
-  on January 16, 2025, for the background behind this complexity.
-
-  Additional it is also checked if the host is reachable
-#}
-
-    healthcheck:
-      test:
-        - CMD-SHELL
-        - >
-          if [ ! -f /tmp/email_sent ]; then
-            echo 'Subject: testmessage from {{domains | get_domain(application_id)}}\n\nSUCCESSFULL' | msmtp -t {{users.blackhole.email}} && touch /tmp/email_sent;
-          fi &&
-          curl -f http://localhost:80/ || exit 1
-      interval: 1m
-      timeout: 20s
-      retries: 3