geo detection

docker-compose.yml

@@ -1,23 +1,19 @@
-version: '3.8'
-
 services:
   bot:
     build: .
     container_name: telegram-tinder-bot
     restart: unless-stopped
-    depends_on:
-      db:
-        condition: service_healthy
     env_file: .env
     environment:
       - NODE_ENV=production
-      - DB_HOST=db
-      - DB_PORT=5432
-      - DB_NAME=telegram_tinder_bot
-      - DB_USERNAME=postgres
+      - DB_HOST=${DB_HOST:-db}
+      - DB_PORT=${DB_PORT:-5432}
+      - DB_NAME=${DB_NAME:-telegram_tinder_bot}
+      - DB_USERNAME=${DB_USERNAME:-postgres}
+      - DB_PASSWORD=${DB_PASSWORD:-postgres}
     volumes:
-      - ./uploads:/app/uploads
-      - ./logs:/app/logs
+      - ./uploads:/app/uploads:rw
+      - ./logs:/app/logs:rw
     networks:
       - bot-network
     healthcheck:
@@ -32,9 +28,9 @@ services:
     container_name: postgres-tinder
     restart: unless-stopped
     environment:
-      - POSTGRES_DB=telegram_tinder_bot
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=${DB_PASSWORD:-password123}
+      - POSTGRES_DB=${DB_NAME:-telegram_tinder_bot}
+      - POSTGRES_USER=${DB_USERNAME:-postgres}
+      - POSTGRES_PASSWORD=${DB_PASSWORD:-postgres}
     volumes:
       - postgres_data:/var/lib/postgresql/data
     ports:
@@ -42,19 +38,18 @@ services:
     networks:
       - bot-network
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 5s
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME:-postgres} -d ${DB_NAME:-telegram_tinder_bot}"]
+      interval: 10s
       timeout: 5s
       retries: 5
-
+      start_period: 10s
+      
   adminer:
     image: adminer:latest
     container_name: adminer-tinder
     restart: unless-stopped
     ports:
       - "8080:8080"
-    depends_on:
-      - db
     networks:
       - bot-network