From 5d224a13d04b073e5a92f77da020ca569bcc6f09 Mon Sep 17 00:00:00 2001
From: Alexander Borg <borg@servernet.se>
Date: Sat, 16 Aug 2025 19:56:12 +0200
Subject: [PATCH] Fix jwt-token

---
 docker-compose.simple.yml | 16 ++++++++--------
 docker-compose.yml        | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docker-compose.simple.yml b/docker-compose.simple.yml
index 74237d1..a3bbbab 100644
--- a/docker-compose.simple.yml
+++ b/docker-compose.simple.yml
@@ -14,7 +14,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     ports:
-      - "5432:5432"
+      - "5433:5432"
     networks:
       - drone-network
     healthcheck:
@@ -32,7 +32,7 @@ services:
     volumes:
       - redis_data:/data
     ports:
-      - "6379:6379"
+      - "6380:6379"
     networks:
       - drone-network
     healthcheck:
@@ -75,7 +75,7 @@ services:
       redis:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:3001/api/health"]
+      test: ["CMD", "curl", "-f", "http://localhost:3002/api/health"]
       interval: 30s
       timeout: 10s
       retries: 3
@@ -86,12 +86,12 @@ services:
       context: ./client
       dockerfile: Dockerfile
       args:
-        VITE_API_URL: http://localhost:3001/api
-        VITE_WS_URL: ws://localhost:3001
+        VITE_API_URL: http://localhost:3002/api
+        VITE_WS_URL: ws://localhost:3002
     container_name: drone-detection-frontend
     restart: unless-stopped
     ports:
-      - "3000:80"
+      - "3001:80"
     networks:
       - drone-network
     depends_on:
@@ -110,14 +110,14 @@ services:
     container_name: drone-detection-simulator
     restart: "no"
     environment:
-      API_URL: http://backend:3001/api
+      API_URL: http://backend:3002/api
     networks:
       - drone-network
     depends_on:
       - backend
     profiles:
       - simulation
-    command: python drone_simulator.py --api-url http://backend:3001/api --devices 5 --duration 3600
+    command: python drone_simulator.py --api-url http://backend:3002/api --devices 5 --duration 3600
 
 volumes:
   postgres_data:
diff --git a/docker-compose.yml b/docker-compose.yml
index a5b2d99..2a79432 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - postgres_data:/var/lib/postgresql/data
       - ./server/scripts/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql
     ports:
-      - "5432:5432"
+      - "5433:5432"
     networks:
       - drone-network
     healthcheck:
@@ -33,7 +33,7 @@ services:
     volumes:
       - redis_data:/data
     ports:
-      - "6379:6379"
+      - "6380:6379"
     networks:
       - drone-network
     healthcheck:
@@ -63,9 +63,9 @@ services:
       TWILIO_ACCOUNT_SID: ${TWILIO_ACCOUNT_SID}
       TWILIO_AUTH_TOKEN: ${TWILIO_AUTH_TOKEN}
       TWILIO_PHONE_NUMBER: ${TWILIO_PHONE_NUMBER}
-      CORS_ORIGIN: http://localhost:3000
+      CORS_ORIGIN: http://localhost:3001
     ports:
-      - "3001:3001"
+      - "3002:3001"
     volumes:
       - ./server/logs:/app/logs
     networks:
@@ -87,12 +87,12 @@ services:
       context: ./client
       dockerfile: Dockerfile
       args:
-        VITE_API_URL: http://localhost:3001/api
-        VITE_WS_URL: ws://localhost:3001
+        VITE_API_URL: http://localhost:3002/api
+        VITE_WS_URL: ws://localhost:3002
     container_name: drone-detection-frontend
     restart: unless-stopped
     ports:
-      - "3000:80"
+      - "3001:80"
     networks:
       - drone-network
     depends_on:
@@ -109,8 +109,8 @@ services:
     container_name: drone-detection-nginx
     restart: unless-stopped
     ports:
-      - "80:80"
-      - "443:443"
+      - "8080:80"
+      - "8443:443"
     volumes:
       - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf
       - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf