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"]