From 6470fb758842687c2b16158e424581d75c46d9f7 Mon Sep 17 00:00:00 2001
From: Andrey Smakotin <slamfromm@gmail.com>
Date: Fri, 12 Dec 2025 20:48:16 +0300
Subject: [PATCH] Fix volume mounts for media and celere worker paths

---
 docker/docker-compose.yml   | 7 ++++---
 docker/entrypoint.sh        | 6 ++++++
 myproject/products/tasks.py | 1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6ce8033..ff1e420 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -59,8 +59,9 @@ services:
       # Монтируем код приложения для горячего обновления (опционально, если нужно обновлять без пересборки)
       # - /Volume1/DockerAppsData/mixapp/app:/app
       # Медиа и статика
-      - /Volume1/DockerAppsData/mixapp/media:/app/media
-      - /Volume1/DockerAppsData/mixapp/static:/app/staticfiles
+      # Медиа и статика (монтируем туда, где их ждет Django: внутри myproject)
+      - /Volume1/DockerAppsData/mixapp/media:/app/myproject/media
+      - /Volume1/DockerAppsData/mixapp/static:/app/myproject/staticfiles
     ports:
       - "8000:8000"
     depends_on:
@@ -86,7 +87,7 @@ services:
       - REDIS_HOST=redis
     volumes:
       - /Volume1/DockerAppsData/mixapp/app:/app
-      - /Volume1/DockerAppsData/mixapp/media:/app/media
+      - /Volume1/DockerAppsData/mixapp/media:/app/myproject/media
     depends_on:
       db:
         condition: service_healthy
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index df06221..eae43b2 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -147,6 +147,12 @@ with schema_context('public'):
 EOF
 }
 
+# Если manage.py не в текущей директории, но есть в подпапке myproject
+if [ ! -f "manage.py" ] && [ -d "myproject" ]; then
+    echo "Changing directory to myproject..."
+    cd myproject
+fi
+
 case "$1" in
     web)
         wait_for_postgres
diff --git a/myproject/products/tasks.py b/myproject/products/tasks.py
index 67d531c..3b0d1dc 100644
--- a/myproject/products/tasks.py
+++ b/myproject/products/tasks.py
@@ -14,6 +14,7 @@ import logging
 from celery import shared_task
 from django.db import connection
 from django.apps import apps
+from django.conf import settings
 from django.core.files.storage import default_storage
 
 logger = logging.getLogger(__name__)