Major refactor

docker-compose.yml

@@ -1,69 +1,56 @@
 x-env_file: &env
   - path: .env
     required: true
-  - path: .env.local
-    required: false
+
+x-restart: &default_restart
+  restart: unless-stopped
 
 name: siren
 services:
-  bot:
+  app:
     image: siren:${SIREN_VERSION:-latest}
-    container_name: siren-bot
+    container_name: siren-app
     env_file: *env
     environment:
       DATABASE_HOST: siren-postgres
       DATABASE_PORT: 5432
-      REDIS_HOST: siren-redis
-      REDIS_PORT: 6379
+      VALKEY_HOST: siren-valkey
+      VALKEY_PORT: 6379
       DATA_DIR_PATH: /data
     volumes:
-      - ${DATA_DIR_PATH:-~/data}:/data
+      - ${DATA_DIR_PATH:-./data}:/data
     depends_on:
       - postgres
-    networks:
-      - frontend
-      - backend
-    restart: unless-stopped
     profiles:
-      - bot
+      - app
+    <<: *default_restart
 
   postgres:
-    image: postgres:latest
+    image: postgres:18.0
     container_name: siren-postgres
     env_file: *env
     environment:
-      POSTGRES_USER: ${DATABASE_USER}
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-      POSTGRES_DB: ${DATABASE_NAME}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+      PGDATA: /var/lib/postgresql/data
     volumes:
      - postgres:/var/lib/postgresql/data
      - postgres_logs:/var/log
     ports:
       - ${DATABASE_PORT:-5432}:5432
-    networks:
-      - backend
-    restart: unless-stopped
-    profiles:
-      - backend
+    <<: *default_restart
 
-  redis:
-    image: redis:latest
-    container_name: siren-redis
+  valkey:
+    image: valkey/valkey:9.0.0
+    container_name: siren-valkey
     volumes:
-      - redis:/data
+      - valkey:/data
     ports:
-      - ${REDIS_PORT:-6379}:6379
-    networks:
-      - backend
-    restart: unless-stopped
-    profiles:
-      - backend
+      - ${VALKEY_PORT:-6379}:6379
+    <<: *default_restart
 
 volumes:
   postgres:
   postgres_logs:
-  redis:
-
-networks:
-  frontend:
-  backend:
+  valkey: