Added draft for central postgres and mariadb. variables and networks still need to be adapted

roles/docker-openproject/tasks/main.yml

@@ -2,6 +2,11 @@
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
+- name: create database in central Postgres
+  include_role:
+    name: docker-postgres
+  when: enable_central_database | bool
+
 - name: "include tasks update-repository-with-docker-compose.yml"
   include_tasks: update-repository-with-docker-compose.yml
 

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

@@ -5,8 +5,8 @@ networks:
   backend:
 
 volumes:
-  pgdata:
-  opdata:
+  database:
+  data:
 
 x-op-restart-policy: &restart_policy
   restart: unless-stopped
@@ -15,8 +15,8 @@ x-op-image: &image
 x-op-app: &app
   <<: [*image, *restart_policy]
   environment:
-    OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS:-true}"
-    OPENPROJECT_HOST__NAME: "${OPENPROJECT_HOST__NAME:-localhost:8080}"
+    OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS}"
+    OPENPROJECT_HOST__NAME: "${OPENPROJECT_HOST__NAME}"
     OPENPROJECT_HSTS: "${OPENPROJECT_HSTS:-true}"
     RAILS_CACHE_STORE: "memcache"
     OPENPROJECT_CACHE__MEMCACHE__SERVER: "cache:11211"
@@ -27,19 +27,14 @@ x-op-app: &app
     # set to true to enable the email receiving feature. See ./docker/cron for more options
     IMAP_ENABLED: "${IMAP_ENABLED:-false}"
   volumes:
-    - "${OPDATA}:/var/openproject/assets"
-    - "${PGDATA}:/var/openproject/pgdata"
+    - "data:/var/openproject/assets"
+    - "database:/var/openproject/pgdata"
 
 services:
-  database:
-    image: postgres:13
-    <<: *restart_policy
-    stop_grace_period: "3s"
-    volumes:
-      - "${PGDATA}:/var/lib/postgresql/data"
-    environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      POSTGRES_DB: openproject
+
+{% if not ( enable_central_database | lower | bool )  %}
+{% include 'templates/docker-postgres-service.yml.j2' %}
+{% endif %}
     networks:
       - backend
 
@@ -53,7 +48,7 @@ services:
     <<: [*image, *restart_policy]
     command: "./docker/prod/proxy"
     ports:
-      - "${PORT:-8080}:80"
+      - "${PORT}:80"
     environment:
       APP_HOST: web
       OPENPROJECT_RAILS__RELATIVE__URL__ROOT: "${OPENPROJECT_RAILS__RELATIVE__URL__ROOT:-}"
@@ -62,8 +57,8 @@ services:
     networks:
       - frontend
     volumes:
-      - "${OPDATA}:/var/openproject/assets"
-      - "${PGDATA}:/var/openproject/pgdata"
+      - "data:/var/openproject/assets"
+      - "database:/var/openproject/pgdata"
   
   web:
     <<: *app
@@ -72,7 +67,9 @@ services:
       - frontend
       - backend
     depends_on:
+{% if not ( enable_central_database | lower | bool )  %}
       - database
+{% endif %}
       - cache
       - seeder
     labels:
@@ -99,7 +96,9 @@ services:
     networks:
       - backend
     depends_on:
+{% if not ( enable_central_database | lower | bool )  %}
       - database
+{% endif %}
       - cache
       - seeder
 
@@ -109,7 +108,9 @@ services:
     networks:
       - backend
     depends_on:
+{% if not ( enable_central_database | lower | bool )  %}
       - database
+{% endif %}
       - cache
       - seeder
 

roles/docker-openproject/templates/env.j2

@@ -15,7 +15,4 @@ IMAP_ENABLED=false
 POSTGRES_PASSWORD="{{ database_password }}"
 DATABASE_URL="postgres://{{ database_username }}:{{ database_password }}@{{database_host}}/{{database_databasename}}?pool=20&encoding=unicode&reconnect=true"
 RAILS_MIN_THREADS=4
-RAILS_MAX_THREADS=16
-
-PGDATA="pgdata"
-OPDATA="opdata"
+RAILS_MAX_THREADS=16