From ef80a66b691cfc6662972e2243f427e3c2e5f4b7 Mon Sep 17 00:00:00 2001
From: erjemin <erjemin@gmail.com>
Date: Tue, 31 Mar 2026 01:25:15 +0300
Subject: [PATCH] =?UTF-8?q?refactor:=20=D0=A0=D0=B5=D0=BE=D1=80=D0=B3?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D1=83=D0=BA=D1=82=D1=83=D1=80=D1=8B=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20-=20database/=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BF=D0=BA=D0=B0=20=D0=B2=20=D0=BA=D0=BE=D1=80=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=91=D0=94=20-=20public/=20=D0=B4=D0=BB=D1=8F=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=82=D0=B8=D0=BA=D0=B8=20=D0=B8=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=B8=D0=B0=20(=D0=BC=D0=BE=D0=BD=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D1=83=D1=8E=D1=82=D1=81=D1=8F=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=BE)=20-=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20docker-compose=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D1=8B=20=D1=81=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BD=D1=8B=D0=BC=D0=B8=20=D1=82=D0=BE=D0=BC=D0=B0=D0=BC=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                                |  2 ++
 database/.gitkeep                           |  0
 docker-compose.prod.yml                     | 13 ++++++++-----
 docker-compose.yml                          |  6 ++++--
 rosmorport_tsts/rosmorport_tsts/settings.py |  4 +++-
 5 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 database/.gitkeep

diff --git a/.env.example b/.env.example
index 3e1a245..5f02f51 100644
--- a/.env.example
+++ b/.env.example
@@ -12,8 +12,10 @@ ADMIN_URL=hidden-admin-panel/
 
 # ========================================
 # База данных - SQLite (для разработки)
+# Файл БД находится в папке database в корне проекта (будет смонтирована в Docker)
 # ========================================
 DB_ENGINE=django.db.backends.sqlite3
+DB_NAME=database/db.sqlite3
 DB_NAME=db.sqlite3
 
 # ========================================
diff --git a/database/.gitkeep b/database/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index f607db2..13f568e 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -27,10 +27,11 @@ services:
       - DB_PASSWORD=${POSTGRES_PASSWORD:-postgres}
       - PYTHONUNBUFFERED=1
     
-    # Тома для статических файлов и медиа
+    # Тома для медиа, статики и БД
     volumes:
-      - django_staticfiles:/app/public/static
-      - django_mediafiles:/app/public/media
+      - public_media:/app/public/media
+      - public_static:/app/public/static
+      - database:/app/database
       - ./logs:/app/logs
     
     # Перенаправляем порты
@@ -114,9 +115,11 @@ services:
 volumes:
   postgres_data:
     driver: local
-  django_staticfiles:
+  public_media:
     driver: local
-  django_mediafiles:
+  public_static:
+    driver: local
+  database:
     driver: local
 
 # Сеть для сервисов
diff --git a/docker-compose.yml b/docker-compose.yml
index a2cf73d..dc06877 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,8 +24,10 @@ services:
     # Монтируем текущую директорию для разработки
     volumes:
       - .:/app
-      - django_staticfiles:/app/public/static
-      - django_mediafiles:/app/public/media
+      - ./public/static:/app/public/static
+      - ./public/media:/app/public/media
+      - ./database:/app/database
+      - ./logs:/app/logs
     
     # Перенаправляем порты
     ports:
diff --git a/rosmorport_tsts/rosmorport_tsts/settings.py b/rosmorport_tsts/rosmorport_tsts/settings.py
index 9b11f8c..ab27b55 100644
--- a/rosmorport_tsts/rosmorport_tsts/settings.py
+++ b/rosmorport_tsts/rosmorport_tsts/settings.py
@@ -143,7 +143,9 @@ elif 'mysql' in DB_ENGINE:
     }
 else:
     # SQLite (по умолчанию для разработки)
-    db_path = get_env('DB_NAME', str(BASE_DIR / 'db.sqlite3'))
+    # DATABASE_ROOT: корень проекта (где лежит manage.py родительской папки)
+    PROJECT_ROOT = BASE_DIR.parent
+    db_path = get_env('DB_NAME', str(PROJECT_ROOT / 'database' / 'db.sqlite3'))
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.sqlite3',