Refactored docker-compose roles

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

@@ -1,26 +1,18 @@
-services:
-
-{% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
-
-{% include 'roles/docker-oauth2-proxy/templates/container.yml.j2' %}
+{% include 'roles/docker-compose/templates/base.yml.j2' %}
 
   application:
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
     image: "{{ applications[application_id].images.gitea }}"
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:3000"
+      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
       - "{{ports.public.ssh[application_id]}}:22"
     volumes:
       - data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://127.0.0.1:3000"]
-      interval: 1m
-      timeout: 10s
-      retries: 3
+{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
-{% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
+{% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 
 {% include 'templates/docker/compose/volumes.yml.j2' %}
   data:

roles/docker-gitea/vars/configuration.yml

@@ -36,4 +36,8 @@ csp:
       - "data:"
 domains:
   aliases:
-    - "git.{{ primary_domain }}"
+    - "git.{{ primary_domain }}"
+docker:
+  services:
+    database:
+      enabled: true

roles/docker-gitea/vars/main.yml

@@ -1,4 +1,5 @@
 application_id:     "gitea"
+container_port:   3000
 database_type:      "mariadb"
 gitea_ldap_auth_args:
   - '--name "LDAP ({{ primary_domain }})"'