Overhaul

docker-compose.yml

@@ -25,7 +25,7 @@ services:
     volumes:
       - ./ssl:/etc/nginx/ssl/
     networks:
-      - default
+      - web
     <<: *default_restart
 
   postgres:
@@ -37,36 +37,32 @@ services:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: ${POSTGRES_DB}
     volumes:
-     - /data/aviation/postgres:/var/lib/postgresql/data
-     - /data/aviation/postgres_logs:/var/log
+     - postgres:/var/lib/postgresql/data
+     - postgres_logs:/var/log
     ports:
       - "${POSTGRES_PORT:-5432}:5432"
-    networks:
-      - default
     profiles:
       - backend
     <<: *default_restart
 
-  redis:
-    image: gitea.bensherriff.com/homelab/redis:8.0-M03
-    container_name: aviation-redis
+  valkey:
+    image: valkey/valkey:8.1.3
+    container_name: aviation-valkey
     volumes:
-      - redis:/data
+      - valkey:/data
     ports:
-      - "${REDIS_PORT:-6379}:6379"
+      - "${VALKEY_PORT:-6379}:6379"
     healthcheck:
-      test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
+      test: [ "CMD", "valkey-cli", "--raw", "incr", "ping" ]
       interval: 10s
       timeout: 5s
       retries: 3
-    networks:
-      - default
     profiles:
       - backend
     <<: *default_restart
 
   minio:
-    image: gitea.bensherriff.com/homelab/minio:RELEASE.2025-02-28T09-55-16Z
+    image: minio/minio:RELEASE.2025-07-23T15-54-02Z
     container_name: aviation-minio
     environment:
       MINIO_ROOT_USER: ${MINIO_ROOT_USER}
@@ -78,8 +74,6 @@ services:
     ports:
       - "${MINIO_PORT:-9000}:9000"
       - "${MINIO_INTERNAL_PORT:-9001}:9001"
-    networks:
-      - default
     profiles:
       - backend
     command: server --console-address ":9001" /data
@@ -97,8 +91,8 @@ services:
       API_PORT: 5000
       POSTGRES_HOST: aviation-postgres
       POSTGRES_PORT: 5432
-      REDIS_HOST: aviation-redis
-      REDIS_PORT: 6379
+      VALKEY_HOST: aviation-valkey
+      VALKEY_PORT: 6379
       MINIO_HOST: aviation-minio
       MINIO_PORT: 9000
       TEMPLATE_DIR: /templates
@@ -109,36 +103,12 @@ services:
       - "${API_PORT:-5000}:5000"
     depends_on:
       - postgres
-      - redis
+      - valkey
       - minio
-    networks:
-      - default
     profiles:
       - api
     <<: *default_restart
 
-  # Development Containers
-#  ui-dev:
-#    image: gitea.bensherriff.com/bsherriff/aviation-ui:latest
-#    container_name: aviation-ui-dev
-#    build:
-#      context: .
-#      dockerfile: Dockerfile
-#    env_file: *env
-#    environment:
-#      - VITE_NODE_ENV=${VITE_NODE_ENV:-development}
-#    ports:
-#      - "${UI_PORT:-3000}:3000"
-#    volumes:
-#      - ./ui/src:/app/src
-#      - ./ui/public:/app/public
-#      - ./ui/styles:/app/styles
-#    networks:
-#      - default
-#    profiles:
-#      - dev
-#    command: ["npm", "run", "dev"]
-#    <<: *default_restart
   mailpit:
     image: axllent/mailpit
     container_name: mailpit
@@ -152,16 +122,17 @@ services:
       - "${MAILPIT_SMTP_PORT:-1025}:1025"
     volumes:
       - mailpit:/data
-    networks:
-      - default
     profiles:
       - dev
     <<: *default_restart
 
 volumes:
-  redis:
+  postgres:
+  postgres_logs:
+  valkey:
   minio:
   mailpit:
 
 networks:
-  default:
+  web:
+    driver: bridge