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

@@ -6,8 +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-phpmyadmin/templates/docker-compose.yml.j2

@@ -3,17 +3,9 @@ services:
 {% include 'roles/docker-oauth2-proxy/templates/container.yml.j2' %}
 
   application:
-    logging:
-      driver: journald
     image: phpmyadmin/phpmyadmin:{{applications.phpmyadmin.version}}
     container_name: phpmyadmin
-    environment:
-      PMA_HOST: central-mariadb
-{% if applications.phpmyadmin.autologin | bool %}
-      PMA_USER: root
-      PMA_PASSWORD: "{{central_mariadb_root_password}}"
-{% endif %}
-    restart: {{docker_restart_policy}}
+{% include 'roles/docker-compose/templates/services/base.yml.j2' %}
     ports:
       - "127.0.0.1:{{http_port}}:80"
 {% include 'templates/docker/container/depends-on-just-database.yml.j2' %}

roles/docker-phpmyadmin/templates/env.j2

@@ -0,0 +1,5 @@
+PMA_HOST= central-mariadb
+{% if applications.phpmyadmin.autologin | bool %}
+PMA_USER= root
+PMA_PASSWORD= "{{central_mariadb_root_password}}"
+{% endif %}