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

@@ -6,6 +6,16 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: add docker-compose.yml
-  template: src=docker-compose.yml.j2 dest={{docker_compose.directories.instance}}docker-compose.yml
+- name: "create {{docker_compose.files.docker_compose}}"
+  template:
+    src:	"docker-compose.yml.j2"
+    dest:	"{{docker_compose.files.docker_compose}}"
+  notify: docker compose project setup
+
+- name: "create {{docker_compose.files.env}}"
+  template: 
+    src:  "env.j2" 
+    dest: "{{docker_compose.files.env}}"
+    mode: '770'
+    force: yes
   notify: docker compose project setup

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

@@ -3,24 +3,8 @@ services:
 {% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
 
   application:
-    logging:
-      driver: journald
-    restart: {{docker_restart_policy}}
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     image: "gitea/gitea:{{applications.gitea.version}}"
-    environment:
-      - USER_UID=1000
-      - USER_GID=1000
-      - DB_TYPE=mysql
-      - DB_HOST={{database_host}}:{{database_port}}
-      - DB_NAME={{database_name}}
-      - DB_USER={{database_username}}
-      - DB_PASSWD={{database_password}}
-      - SSH_PORT={{ports.public.ssh_ports[application_id]}}
-      - SSH_LISTEN_PORT=22
-      - DOMAIN={{domain}}
-      - SSH_DOMAIN={{domain}}
-      - RUN_MODE="{{run_mode}}"
-      - ROOT_URL="https://{{domain}}/"
     ports:
       - "127.0.0.1:{{http_port}}:3000"
       - "{{ports.public.ssh_ports[application_id]}}:22"

roles/docker-gitea/templates/env.j2

@@ -0,0 +1,13 @@
+USER_UID=1000
+USER_GID=1000
+DB_TYPE=mysql
+DB_HOST={{database_host}}:{{database_port}}
+DB_NAME={{database_name}}
+DB_USER={{database_username}}
+DB_PASSWD={{database_password}}
+SSH_PORT={{ports.public.ssh_ports[application_id]}}
+SSH_LISTEN_PORT=22
+DOMAIN={{domain}}
+SSH_DOMAIN={{domain}}
+RUN_MODE="{{run_mode}}"
+ROOT_URL="https://{{domain}}/"