From 68983bbd3281b0a18dd7afb76a3dd5ac951d46ac Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Sat, 16 Aug 2025 20:02:18 +0300
Subject: [PATCH] docker-compose: streamline Redis and Telegram bot
 configurations; ensure consistent environment variable usage and health
 checks

---
 docker-compose.dev.yml | 28 ++++++++++------------------
 docker-compose.yml     | 23 ++++++++++++++---------
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 4617437..ce0c5de 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,52 +1,44 @@
 services:
   redis:
-    env_file:
-      - .env
     image: redis:8-alpine
     restart: always
+    env_file:
+      - .env
+    command: ['redis-server', '--requirepass', '${REDIS_PASSWORD}']
     ports:
-      - "127.0.0.1:6379:6379"
+      - '127.0.0.1:6379:6379'
     volumes:
       - redis-data:/data
-    command: ["redis-server", "--requirepass", "${REDIS_PASSWORD}"]
-    deploy:
-      resources:
-        limits:
-          cpus: '0.50'
-          memory: 512M
-        reservations:
-          cpus: '0.25'
-          memory: 256M
     healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
+      test: ['CMD', 'redis-cli', 'ping']
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 30s
 
   next-downloader-bot:
-    env_file:
-      - .env
     build:
       context: .
       dockerfile: ./apps/bot/Dockerfile
     restart: always
+    env_file:
+      - .env
     depends_on:
       - redis
       - telegram-bot-api
 
   telegram-bot-api:
+    image: aiogram/telegram-bot-api:latest
     restart: always
     env_file:
       - .env
-    image: aiogram/telegram-bot-api:latest
     # environment:
     #   TELEGRAM_API_ID: "<api-id>"
     #   TELEGRAM_API_HASH: "<api-hash>"
+    ports:
+      - '127.0.0.1:8081:8081'
     volumes:
       - telegram-bot-api-data:/var/lib/telegram-bot-api
-    ports:
-      - "127.0.0.1:8081:8081"
 
 volumes:
   telegram-bot-api-data:
diff --git a/docker-compose.yml b/docker-compose.yml
index a1bfc4c..646c606 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,12 @@
 services:
   redis:
-    env_file:
-      - .env
     image: redis:8-alpine
     restart: always
+    env_file:
+      - .env
+    command: ['redis-server', '--requirepass', '${REDIS_PASSWORD}']
     volumes:
       - redis-data:/data
-    command: ['redis-server', '--requirepass', '${REDIS_PASSWORD}']
     deploy:
       resources:
         limits:
@@ -23,26 +23,31 @@ services:
       start_period: 30s
 
   next-downloader-bot:
-    image: "${DOCKERHUB_USERNAME}/next-downloader-bot:${BOT_IMAGE_TAG}"
+    image: '${DOCKERHUB_USERNAME}/next-downloader-bot:${BOT_IMAGE_TAG}'
+    restart: always
     env_file:
       - .env
-    restart: always
     depends_on:
       - redis
       - telegram-bot-api
-
-  telegram-bot-api:
-    restart: always
     deploy:
       resources:
         limits:
           cpus: '0.50'
           memory: 512M
+
+  telegram-bot-api:
+    image: aiogram/telegram-bot-api:latest
+    restart: always
     env_file:
       - .env
-    image: aiogram/telegram-bot-api:latest
     volumes:
       - telegram-bot-api-data:/var/lib/telegram-bot-api
+    deploy:
+      resources:
+        limits:
+          cpus: '0.50'
+          memory: 512M
 
 volumes:
   telegram-bot-api-data: