Refactored docker-compose roles

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

@@ -1,8 +1,4 @@
-services:
-
-{% include 'templates/docker/services/redis.yml.j2' %}
-
-{% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
+{% include 'roles/docker-compose/templates/base.yml.j2' %}
 
   application:
     image: "nextcloud:{{applications.nextcloud.version}}-fpm-alpine"
@@ -15,8 +11,8 @@ services:
       interval: 1m
       timeout: 10s
       retries: 3
-{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
-{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
+{% include 'roles/docker-container/templates/base.yml.j2' %}
+{% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
         ipv4_address: 192.168.102.69
 
@@ -49,16 +45,13 @@ services:
       driver: journald
     restart: {{docker_restart_policy}}
     ports:
-      - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
+      - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
     volumes:
         - "{{docker_compose.directories.volumes}}nginx.conf:/etc/nginx/nginx.conf:ro"
     volumes_from:
       - application
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:80/"]
-      interval: 1m
-      timeout: 10s
-      retries: 3
+
+{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
     networks:
       default:
         ipv4_address: 192.168.102.67
@@ -77,7 +70,7 @@ services:
       interval: 1m
       timeout: 10s
       retries: 3
-{% include 'templates/docker/container/depends-on-database-redis.yml.j2' %}
+{% include 'roles/docker-container/templates/depends_on_dmbs.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
         ipv4_address: 192.168.102.70
 

roles/docker-nextcloud/vars/configuration.yml

@@ -11,7 +11,12 @@ csp:
 domains:
   canonical:
     - "cloud.{{ primary_domain }}"
-
+docker:
+  services:
+    redis:
+      enabled: true
+    database: 
+      enabled: true
 oidc:
   enabled:                    "{{ applications.nextcloud.features.oidc | default(true) }}"      # Activate OIDC for Nextcloud
   # floavor decides which OICD plugin should be used. 

roles/docker-nextcloud/vars/main.yml

@@ -1,6 +1,7 @@
 ---
 # General
 application_id:                                     "nextcloud"                                                   # Application identifier
+container_port:                                   80
 
 # Database
 database_password:                                  "{{applications.nextcloud.credentials.database_password}}"    # Database password