From 118c86a73c161ebf6eb870e752edf3fcac9386e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=BA=D0=B8=D0=BD=20=D0=A1=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= <ckoshkin@yandex.ru>
Date: Tue, 2 Dec 2025 17:12:42 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=82=D0=BE=D1=80=D0=BE=D0=B9=20=D1=82?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B9=20=D1=84=D0=B8=D0=BA=D1=81=D0=B0=20celery?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                   | 3 ++-
 .env.prod                  | 3 ++-
 dbapp/entrypoint-celery.sh | 4 ++--
 docker-compose.prod.yaml   | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.env.dev b/.env.dev
index 463871d..228de7d 100644
--- a/.env.dev
+++ b/.env.dev
@@ -2,7 +2,8 @@
 
 # Django Settings
 DEBUG=True
-ENVIRONMENT=development
+# ENVIRONMENT=development
+DJANGO_ENVIRONMENT=development
 DJANGO_SETTINGS_MODULE=dbapp.settings.development
 SECRET_KEY=django-insecure-dev-key-only-for-development
 
diff --git a/.env.prod b/.env.prod
index 6215d48..61b3613 100644
--- a/.env.prod
+++ b/.env.prod
@@ -1,5 +1,6 @@
 DEBUG=False
-ENVIRONMENT=production
+# ENVIRONMENT=production
+DJANGO_ENVIRONMENT=production
 DJANGO_SETTINGS_MODULE=dbapp.settings.production
 SECRET_KEY=django-insecure-dev-key-only-for-production
 
diff --git a/dbapp/entrypoint-celery.sh b/dbapp/entrypoint-celery.sh
index 240fffe..0411f24 100644
--- a/dbapp/entrypoint-celery.sh
+++ b/dbapp/entrypoint-celery.sh
@@ -11,9 +11,9 @@ until PGPASSWORD=$DB_PASSWORD psql -h "$DB_HOST" -U "$DB_USER" -d "$DB_NAME" -c
 done
 echo "PostgreSQL started"
 
-# Ждем Redis
+# Ждем Redis (проверяем через Python, т.к. redis-cli не установлен)
 echo "Waiting for Redis..."
-until redis-cli -h redis ping 2>/dev/null; do
+until python -c "import redis; r = redis.from_url('${CELERY_BROKER_URL}'); r.ping()" 2>/dev/null; do
   echo "Redis is unavailable - sleeping"
   sleep 1
 done
diff --git a/docker-compose.prod.yaml b/docker-compose.prod.yaml
index 91ee352..22cf5ad 100644
--- a/docker-compose.prod.yaml
+++ b/docker-compose.prod.yaml
@@ -3,7 +3,7 @@ services:
     # build:
     #   context: ./dbapp
     #   dockerfile: Dockerfile
-    image: https://registry.geraltserv.ru/geolocation:latest
+    image: registry.geraltserv.ru/geolocation:latest
     env_file:
       - .env.prod
     depends_on:
@@ -18,7 +18,7 @@ services:
     # build:
     #   context: ./dbapp
     #   dockerfile: Dockerfile
-    image: https://registry.geraltserv.ru/geolocation:latest
+    image: registry.geraltserv.ru/geolocation:latest
     env_file:
       - .env.prod
     entrypoint: ["/app/entrypoint-celery.sh"]