From 741bb89bd37dc754adbcc2faa4d1e6c44c30fdaa Mon Sep 17 00:00:00 2001
From: grendervill <focuse@grandell.ru>
Date: Sat, 19 Sep 2026 19:35:38 +0300
Subject: [PATCH] =?UTF-8?q?fix(deploy):=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8F=D1=86=D0=B8=D1=8F=20compose=20=D0=B1?=
 =?UTF-8?q?=D0=B5=D0=B7=20=D0=BF=D1=80=D0=B5=D0=B4=D1=83=D0=BF=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BE=20=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- пути томов и профиль Caddy задаются как GLCHAT_DATA_DIR/GLCHAT_CADDY_PROFILE
  (внутренний DATA_DIR=/app/data остаётся в environment сервиса app)
- значения записываются в .env, поэтому docker compose config проходит без
  предупреждений "variable is not set"
---
 deploy/compose.test.yaml.tpl |  8 ++++----
 deploy/compose.yaml.tpl      |  8 ++++----
 deploy/install.sh            | 13 ++++++++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/deploy/compose.test.yaml.tpl b/deploy/compose.test.yaml.tpl
index dc134d0..8444dc6 100644
--- a/deploy/compose.test.yaml.tpl
+++ b/deploy/compose.test.yaml.tpl
@@ -36,9 +36,9 @@ services:
     ports:
       - "127.0.0.1:${APP_PORT}:8080"
     volumes:
-      - "${DATA_DIR}/db:/app/data/db"
-      - "${DATA_DIR}/files:/app/data/files"
-      - "${DATA_DIR}/backups:/app/data/backups"
+      - "${GLCHAT_DATA_DIR}/db:/app/data/db"
+      - "${GLCHAT_DATA_DIR}/files:/app/data/files"
+      - "${GLCHAT_DATA_DIR}/backups:/app/data/backups"
     logging: *default-logging
     deploy:
       resources:
@@ -90,7 +90,7 @@ services:
     image: caddy:${CADDY_IMAGE_TAG}
     container_name: glchat-caddy
     restart: unless-stopped
-    profiles: ["${CADDY_PROFILE}"]
+    profiles: ["${GLCHAT_CADDY_PROFILE}"]
     ports:
       - "${HTTP_PORT}:80"
       - "${HTTPS_PORT}:443"
diff --git a/deploy/compose.yaml.tpl b/deploy/compose.yaml.tpl
index e8fc8a2..9e4274e 100644
--- a/deploy/compose.yaml.tpl
+++ b/deploy/compose.yaml.tpl
@@ -36,9 +36,9 @@ services:
     ports:
       - "127.0.0.1:${APP_PORT}:8080"
     volumes:
-      - "${DATA_DIR}/db:/app/data/db"
-      - "${DATA_DIR}/files:/app/data/files"
-      - "${DATA_DIR}/backups:/app/data/backups"
+      - "${GLCHAT_DATA_DIR}/db:/app/data/db"
+      - "${GLCHAT_DATA_DIR}/files:/app/data/files"
+      - "${GLCHAT_DATA_DIR}/backups:/app/data/backups"
     logging: *default-logging
     deploy:
       resources:
@@ -92,7 +92,7 @@ services:
     image: caddy:${CADDY_IMAGE_TAG}
     container_name: glchat-caddy
     restart: unless-stopped
-    profiles: ["${CADDY_PROFILE}"]
+    profiles: ["${GLCHAT_CADDY_PROFILE}"]
     ports:
       - "${HTTP_PORT}:80"
       - "${HTTPS_PORT}:443"
diff --git a/deploy/install.sh b/deploy/install.sh
index d32e374..0ae6a8f 100755
--- a/deploy/install.sh
+++ b/deploy/install.sh
@@ -251,8 +251,11 @@ resolve_derived_values() {
     use_external_ip="true"
     PROFILE_LIVEKIT_USE_EXTERNAL_IP="$use_external_ip"
 
+    GLCHAT_DATA_DIR="${GLCHAT_DATA_DIR}"
+    GLCHAT_CADDY_PROFILE="${CADDY_PROFILE}"
     export FILES_DOMAIN_RESOLVED CADDY_PROFILE LIVEKIT_PUBLISH TURN_EXTERNAL_TLS \
-        PROFILE_LIVEKIT_DISABLE_SIMULCAST PROFILE_LIVEKIT_USE_EXTERNAL_IP
+        PROFILE_LIVEKIT_DISABLE_SIMULCAST PROFILE_LIVEKIT_USE_EXTERNAL_IP \
+        GLCHAT_DATA_DIR GLCHAT_CADDY_PROFILE
 }
 
 validate_inputs() {
@@ -470,6 +473,10 @@ APP_IMAGE=${APP_IMAGE}
 CADDY_IMAGE_TAG=${CADDY_IMAGE_TAG}
 LIVEKIT_IMAGE_TAG=${LIVEKIT_IMAGE_TAG}
 
+# --- интерполяция compose (пути и профиль) ---
+GLCHAT_DATA_DIR=${GLCHAT_DATA_DIR}
+GLCHAT_CADDY_PROFILE=${CADDY_PROFILE}
+
 # --- порты ---
 APP_PORT=${APP_PORT}
 LIVEKIT_WS_PORT=${LIVEKIT_WS_PORT}
@@ -616,7 +623,7 @@ render_all_templates() {
         "PROFILE=${PROFILE_RESOLVED}" "APP_IMAGE=${APP_IMAGE}" \
         "APP_PORT=${APP_PORT}" "LIVEKIT_WS_PORT=${LIVEKIT_WS_PORT}" \
         "LIVEKIT_TCP_PORT=${LIVEKIT_TCP_PORT}" "LIVEKIT_UDP_PORT=${LIVEKIT_UDP_PORT}" \
-        "DATA_DIR=${GLCHAT_DATA_DIR}" "LOG_LEVEL=${LOG_LEVEL}" \
+        "GLCHAT_DATA_DIR=${GLCHAT_DATA_DIR}" "LOG_LEVEL=${LOG_LEVEL}" \
         "SQLITE_READ_POOL=${PROFILE_SQLITE_READ_POOL}" \
         "SQLITE_CACHE_SIZE=-${PROFILE_SQLITE_CACHE_MB}000" \
         "SQLITE_MMAP_SIZE=$((PROFILE_SQLITE_MMAP_MB * 1024 * 1024))" \
@@ -626,7 +633,7 @@ render_all_templates() {
         "LIVEKIT_CPUS=${PROFILE_LIVEKIT_CPUS}" "LIVEKIT_MEMORY_LIMIT=${PROFILE_LIVEKIT_LIMIT}" \
         "CADDY_CPUS=1.0" "CADDY_MEMORY_LIMIT=256m" \
         "CADDY_IMAGE_TAG=${CADDY_IMAGE_TAG}" "LIVEKIT_IMAGE_TAG=${LIVEKIT_IMAGE_TAG}" \
-        "CADDY_PROFILE=${CADDY_PROFILE}" "LIVEKIT_PUBLISH=${LIVEKIT_PUBLISH}" \
+        "GLCHAT_CADDY_PROFILE=${CADDY_PROFILE}" \
         "LIVEKIT_API_KEY=${LIVEKIT_API_KEY}" "LIVEKIT_API_SECRET=${LIVEKIT_API_SECRET}" \
         "HTTP_PORT=${HTTP_PORT}" "HTTPS_PORT=${HTTPS_PORT}"