fix: depends on

Author: An0nX

docker-compose.template.yml

@@ -7,11 +7,11 @@ services:
     restart: unless-stopped
     volumes:
       - ./userbot/modules:/app/userbot/modules
-    # 'depends_on' ensures the database is ready before the userbot starts.
-    # This will be removed by setup.py if an external database is used.
+    # 'depends_on' теперь ждет, пока сервис 'db' станет "здоровым" (healthy),
+    # а не просто запустится. Это решает проблему race condition.
     depends_on:
-      - db
-    # The command no longer needs --accounts, as the bot runs all enabled accounts from the DB
+      db:
+        condition: service_healthy
     command: ["python3", "-m", "userbot"]
 
   db:
@@ -24,10 +24,15 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     ports:
-      # Exposes the database port to the host machine.
-      # Format is HOST_PORT:CONTAINER_PORT
       - "${DB_PORT}:5432"
     restart: unless-stopped
+    # Healthcheck проверяет, готова ли база данных принимать соединения,
+    # прежде чем позволить зависимым сервисам (userbot) стартовать.
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
 volumes:
   postgres_data:

docs/getting-started/installation.md

@@ -21,7 +21,7 @@ cd my_debot
 
 #### Шаг 2: Создайте файл `docker-compose.yml`
 
-Внутри папки `my_debot` создайте файл с именем `docker-compose.yml` и скопируйте в него следующее содержимое:
+Внутри папки `my_debot` создайте файл с именем `docker-compose.yml` и скопируйте в него следующее содержимое. Он уже включает проверку готовности базы данных (`healthcheck`) для стабильного запуска.
 
 ```yaml
 services:
@@ -36,7 +36,8 @@ services:
       # Эта папка будет создана на вашем хосте для хранения модулей
       - ./userbot/modules:/app/userbot/modules
     depends_on:
-      - db
+      db:
+        condition: service_healthy
     command: ["python3", "-m", "userbot"]
 
   db:
@@ -51,6 +52,11 @@ services:
     ports:
       - "${DB_PORT}:5432"
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER} -d ${DB_NAME}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
 volumes:
   postgres_data:

scripts/setup.py

@@ -94,26 +94,27 @@ def main():
     with open(template_path, "r") as f:
         compose_template = f.read()
 
-    userbot_service_definition = "build: ." if deploy_type == "source" else f"image: {prompt_user('Enter Docker image', 'debotcommunity/debot:latest')}"
+    userbot_service_definition = "build: ." if deploy_type == "source" else f"image: whn0thacked/debot:latest"
     compose_content = compose_template.replace("${USERBOT_SERVICE_DEFINITION}", userbot_service_definition)
 
     if not use_docker_db:
-        compose_content = re.sub(r'\s*depends_on:\s+- db', '', compose_content)
+        # Remove the 'db' service and dependencies on it
+        compose_content = re.sub(r'^\s*depends_on:.*?service_healthy\s*$', '', compose_content, flags=re.DOTALL | re.MULTILINE)
         compose_content = re.sub(r'^\s*db:.*?(?=\n\S|\Z)', '', compose_content, flags=re.DOTALL | re.MULTILINE)
-        if 'postgres_data:' in compose_content and 'userbot:' not in compose_content:
-             compose_content = re.sub(r'^\s*volumes:\s*postgres_data:', '', compose_content, flags=re.MULTILINE)
+        # Remove the volumes key if it's now empty and only contains postgres_data
+        compose_content = re.sub(r'^\s*volumes:\s*\n\s*postgres_data:\s*$', '', compose_content, flags=re.MULTILINE)
 
     compose_file_path = project_root / "docker-compose.yml"
     with open(compose_file_path, "w") as f:
         f.write(compose_content.strip() + "\n")
     print(f"✅ Docker Compose file generated: {compose_file_path}")
 
     print("\n--- Setup Complete! ---")
-    print("To start the userbot, run: 'docker-compose up -d'")
+    print("To start the userbot, run: 'docker compose up -d'")
     print("To add your first account, use the management script:")
-    print(f"\n  docker-compose exec userbot python3 -m scripts.manage_account add <account_name>\n")
+    print(f"\n  docker compose exec userbot python3 -m scripts.manage_account add <account_name>\n")
     print("After adding an account, restart the bot to activate the new session:")
-    print("\n  docker-compose restart userbot\n")
+    print("\n  docker compose restart userbot\n")
 
 if __name__ == "__main__":
     main()