borg/drone-detector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix jwt-token

Browse Source
This commit is contained in:
Alexander Borg
2025-08-16 19:56:12 +02:00
parent 52fd44cb0f
commit 5d224a13d0
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docker-compose.simple.yml
View File

@@ -14,7 +14,7 @@ services:
volumes: volumes:
- postgres_data:/var/lib/postgresql/data - postgres_data:/var/lib/postgresql/data
ports: ports:
- "5432:5432" - "5433:5432"
networks: networks:
- drone-network - drone-network
healthcheck: healthcheck:
@@ -32,7 +32,7 @@ services:
volumes: volumes:
- redis_data:/data - redis_data:/data
ports: ports:
- "6379:6379" - "6380:6379"
networks: networks:
- drone-network - drone-network
healthcheck: healthcheck:
@@ -75,7 +75,7 @@ services:
redis: redis:
condition: service_healthy condition: service_healthy
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3001/api/health"] test: ["CMD", "curl", "-f", "http://localhost:3002/api/health"]
interval: 30s interval: 30s
timeout: 10s timeout: 10s
retries: 3 retries: 3
@@ -86,12 +86,12 @@ services:
context: ./client context: ./client
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
VITE_API_URL: http://localhost:3001/api VITE_API_URL: http://localhost:3002/api
VITE_WS_URL: ws://localhost:3001 VITE_WS_URL: ws://localhost:3002
container_name: drone-detection-frontend container_name: drone-detection-frontend
restart: unless-stopped restart: unless-stopped
ports: ports:
- "3000:80" - "3001:80"
networks: networks:
- drone-network - drone-network
depends_on: depends_on:
@@ -110,14 +110,14 @@ services:
container_name: drone-detection-simulator container_name: drone-detection-simulator
restart: "no" restart: "no"
environment: environment:
API_URL: http://backend:3001/api API_URL: http://backend:3002/api
networks: networks:
- drone-network - drone-network
depends_on: depends_on:
- backend - backend
profiles: profiles:
- simulation - 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: volumes:
postgres_data: postgres_data:

18
docker-compose.yml
View File

@@ -15,7 +15,7 @@ services:
- postgres_data:/var/lib/postgresql/data - postgres_data:/var/lib/postgresql/data
- ./server/scripts/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql - ./server/scripts/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql
ports: ports:
- "5432:5432" - "5433:5432"
networks: networks:
- drone-network - drone-network
healthcheck: healthcheck:
@@ -33,7 +33,7 @@ services:
volumes: volumes:
- redis_data:/data - redis_data:/data
ports: ports:
- "6379:6379" - "6380:6379"
networks: networks:
- drone-network - drone-network
healthcheck: healthcheck:
@@ -63,9 +63,9 @@ services:
TWILIO_ACCOUNT_SID: ${TWILIO_ACCOUNT_SID} TWILIO_ACCOUNT_SID: ${TWILIO_ACCOUNT_SID}
TWILIO_AUTH_TOKEN: ${TWILIO_AUTH_TOKEN} TWILIO_AUTH_TOKEN: ${TWILIO_AUTH_TOKEN}
TWILIO_PHONE_NUMBER: ${TWILIO_PHONE_NUMBER} TWILIO_PHONE_NUMBER: ${TWILIO_PHONE_NUMBER}
CORS_ORIGIN: http://localhost:3000 CORS_ORIGIN: http://localhost:3001
ports: ports:
- "3001:3001" - "3002:3001"
volumes: volumes:
- ./server/logs:/app/logs - ./server/logs:/app/logs
networks: networks:
@@ -87,12 +87,12 @@ services:
context: ./client context: ./client
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
VITE_API_URL: http://localhost:3001/api VITE_API_URL: http://localhost:3002/api
VITE_WS_URL: ws://localhost:3001 VITE_WS_URL: ws://localhost:3002
container_name: drone-detection-frontend container_name: drone-detection-frontend
restart: unless-stopped restart: unless-stopped
ports: ports:
- "3000:80" - "3001:80"
networks: networks:
- drone-network - drone-network
depends_on: depends_on:
@@ -109,8 +109,8 @@ services:
container_name: drone-detection-nginx container_name: drone-detection-nginx
restart: unless-stopped restart: unless-stopped
ports: ports:
- "80:80" - "8080:80"
- "443:443" - "8443:443"
volumes: volumes:
- ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf
- ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf