From 9b4b1277eefbb83edbd71bf804827365c20aa674 Mon Sep 17 00:00:00 2001
From: Andrey Smakotin <slamfromm@gmail.com>
Date: Sat, 17 Jan 2026 18:27:57 +0300
Subject: [PATCH] feat: Add Docker infrastructure for multi-tenant Django
 application with services for database, caching, and task processing.

---
 {myproject/docker => docker}/Dockerfile        |  0
 .../docker => docker}/create_public_tenant.py  |  0
 .../docker => docker}/docker-compose.yml       | 18 +++++++++---------
 {myproject/docker => docker}/entrypoint.sh     |  0
 .../docker => docker}/entrypoint.sh.example    |  0
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename {myproject/docker => docker}/Dockerfile (100%)
 rename {myproject/docker => docker}/create_public_tenant.py (100%)
 rename {myproject/docker => docker}/docker-compose.yml (82%)
 rename {myproject/docker => docker}/entrypoint.sh (100%)
 rename {myproject/docker => docker}/entrypoint.sh.example (100%)

diff --git a/myproject/docker/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from myproject/docker/Dockerfile
rename to docker/Dockerfile
diff --git a/myproject/docker/create_public_tenant.py b/docker/create_public_tenant.py
similarity index 100%
rename from myproject/docker/create_public_tenant.py
rename to docker/create_public_tenant.py
diff --git a/myproject/docker/docker-compose.yml b/docker/docker-compose.yml
similarity index 82%
rename from myproject/docker/docker-compose.yml
rename to docker/docker-compose.yml
index aec84a7..d192c16 100644
--- a/myproject/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - /Volume1/DockerAppsData/mixapp/postgres:/var/lib/postgresql/data
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-inventory_db}"]
+      test: [ "CMD-SHELL", "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-inventory_db}" ]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -26,7 +26,7 @@ services:
     volumes:
       - /Volume1/DockerAppsData/mixapp/redis:/data
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: [ "CMD", "redis-cli", "ping" ]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -36,14 +36,14 @@ services:
   # Django Web приложение
   web:
     build:
-      context: /Volume1/DockerAppsData/mixapp/app/myproject
+      context: /Volume1/DockerAppsData/mixapp/app
       dockerfile: docker/Dockerfile
     image: mix_web:latest
     container_name: mix_web
     restart: unless-stopped
     command: web
     env_file:
-      - /Volume1/DockerAppsData/mixapp/app/myproject/docker/.env.docker
+      - .env.docker
     volumes:
       # ВАЖНО: монтируем именно папку проекта в /myproject, чтобы /app/manage.py существовал
       - /Volume1/DockerAppsData/mixapp/app/myproject:/app
@@ -62,14 +62,14 @@ services:
   # Celery Worker
   celery-worker:
     build:
-      context: /Volume1/DockerAppsData/mixapp/app/myproject
+      context: /Volume1/DockerAppsData/mixapp/app
       dockerfile: docker/Dockerfile
     image: mix_celery:latest
     container_name: mix_celery_worker
     restart: unless-stopped
     command: celery-worker
     env_file:
-      - /Volume1/DockerAppsData/mixapp/app/myproject/docker/.env.docker
+      - .env.docker
     volumes:
       - /Volume1/DockerAppsData/mixapp/app/myproject:/app
       - /Volume1/DockerAppsData/mixapp/media:/app/myproject/media
@@ -84,14 +84,14 @@ services:
   # Celery Beat
   celery-beat:
     build:
-      context: /Volume1/DockerAppsData/mixapp/app/myproject
+      context: /Volume1/DockerAppsData/mixapp/app
       dockerfile: docker/Dockerfile
     image: mix_celery:latest
     container_name: mix_celery_beat
     restart: unless-stopped
     command: celery-beat
     env_file:
-      - /Volume1/DockerAppsData/mixapp/app/myproject/docker/.env.docker
+      - .env.docker
     volumes:
       - /Volume1/DockerAppsData/mixapp/app/myproject:/app
     depends_on:
@@ -108,4 +108,4 @@ networks:
 
   proxy-net:
     external: true
-    name: proxy-net
\ No newline at end of file
+    name: proxy-net
diff --git a/myproject/docker/entrypoint.sh b/docker/entrypoint.sh
similarity index 100%
rename from myproject/docker/entrypoint.sh
rename to docker/entrypoint.sh
diff --git a/myproject/docker/entrypoint.sh.example b/docker/entrypoint.sh.example
similarity index 100%
rename from myproject/docker/entrypoint.sh.example
rename to docker/entrypoint.sh.example