Reorganize files

docker-compose.yaml

@@ -15,27 +15,29 @@ volumes:
 x-op-restart-policy: &restart_policy
   restart: unless-stopped
 x-op-image: &image
-  image: openproject/openproject:16-slim
+  image: openproject/openproject:${OPENPROJECT_TAG}
 x-op-app: &app
   <<: [*image, *restart_policy]
   environment:
-    OPENPROJECT_HTTPS: "true"
-    OPENPROJECT_HOST__NAME: "openproject.tvcloud.fr"
-    OPENPROJECT_HSTS: "true"
-    RAILS_CACHE_STORE: "memcache"
-    OPENPROJECT_CACHE__MEMCACHE__SERVER: "openproject-cache:11211"
-    DATABASE_URL: "postgres://postgres:pswd@openproject-db/openproject?pool=20&encoding=unicode&reconnect=true"
+    OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS}"
+    OPENPROJECT_HOST__NAME: "${OPENPROJECT_HOST__NAME}"
+    OPENPROJECT_HSTS: "${OPENPROJECT_HSTS}"
+    RAILS_CACHE_STORE: "${RAILS_CACHE_STORE}"
+    OPENPROJECT_CACHE__MEMCACHE__SERVER: "${OPENPROJECT_CACHE__MEMCACHE__SERVER}"
+    DATABASE_URL: "${DATABASE_URL}"
     RAILS_MIN_THREADS: 4
     RAILS_MAX_THREADS: 16
     # set to true to enable the email receiving feature. See ./docker/cron for more options
-    IMAP_ENABLED: "false"
+    IMAP_ENABLED: "${IMAP_ENABLED}"
+    OPENPROJECT: "${OPENPROJECT}"
+    OPENPROJECT_DB: "${OPENPROJECT_DB}"
   volumes:
-    - "openproject:/var/openproject/assets"
+    - "${OPENPROJECT}:/var/openproject/assets"
 
 services:
   proxy:
     build:
-      dockerfile: ./nginx.Dockerfile
+      context: ./services/nginx
     networks:
       - nextcloud-frontend
       - openproject-frontend
@@ -51,10 +53,11 @@ services:
 
   nextcloud:
     image: nextcloud:31-fpm
-    env_file:
-      - nextcloud-db.env
     environment:
       - MYSQL_HOST=nextcloud-db
+      - MYSQL_PASSWORD=pswd
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
     networks:
       - nextcloud-frontend
       - nextcloud-backend
@@ -66,8 +69,6 @@ services:
   nextcloud-db:
     image: mariadb:11-ubi
     command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
-    env_file:
-      - nextcloud-db.env
     environment:
       - MARIADB_ROOT_PASSWORD=pswd
       - MARIADB_AUTO_UPGRADE=1
@@ -103,7 +104,7 @@ services:
     <<: *restart_policy
     stop_grace_period: "3s"
     volumes:
-      - "openproject-db:/var/lib/postgresql/data"
+      - "${OPENPROJECT_DB}:/var/lib/postgresql/data"
     environment:
       POSTGRES_PASSWORD: pswd
       POSTGRES_DB: openproject