move production to port 8453 and dev to port 8080
This commit is contained in:
@@ -28,6 +28,7 @@ from scanner import process_targets, scan_results
|
||||
|
||||
APP_ROOT = Path(__file__).resolve().parent
|
||||
DB_PATH = Path(os.getenv("DB_PATH", str(APP_ROOT.parent / "data" / "scheduler.db")))
|
||||
print(f"[app] Using DB_PATH: {DB_PATH}")
|
||||
DUT = os.getenv("DUT", "CGW453").strip()
|
||||
REF = os.getenv("REF", "CGW452").strip()
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ from test_config import serialize_station_testpoint_map, resolve_test_config_key
|
||||
|
||||
APP_ROOT = Path(__file__).resolve().parent
|
||||
DB_PATH = Path(os.getenv("DB_PATH", str(APP_ROOT.parent / "data" / "scheduler.db")))
|
||||
print(f"[db] Using DB_PATH: {DB_PATH}")
|
||||
|
||||
# Hardware device names (from environment or defaults)
|
||||
DUT = os.getenv("DUT", "CGW453").strip()
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
services:
|
||||
backend:
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
environment:
|
||||
HOST_BROWSE_ROOT: ${HOST_BROWSE_ROOT}
|
||||
HOST_MOUNT_ROOT: /host
|
||||
DB_PATH: /app/data/scheduler.db-dev
|
||||
PYTHONPATH: /app/src
|
||||
JWT_SECRET: ${JWT_SECRET}
|
||||
JWT_EXPIRES_HOURS: ${JWT_EXPIRES_HOURS}
|
||||
JWT_ALGORITHM: ${JWT_ALGORITHM}
|
||||
DEFAULT_ADMIN_USERNAME: ${DEFAULT_ADMIN_USERNAME}
|
||||
DEFAULT_ADMIN_PASSWORD: ${DEFAULT_ADMIN_PASSWORD}
|
||||
DEFAULT_VIEWER_USERNAME: ${DEFAULT_VIEWER_USERNAME}
|
||||
DEFAULT_VIEWER_PASSWORD: ${DEFAULT_VIEWER_PASSWORD}
|
||||
volumes:
|
||||
- ${HOST_BROWSE_ROOT}:/host
|
||||
- scheduler-db-dev:/app/data
|
||||
expose:
|
||||
- "8000"
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
depends_on:
|
||||
- backend
|
||||
expose:
|
||||
- "80"
|
||||
restart: unless-stopped
|
||||
|
||||
scheduler-nginx:
|
||||
image: nginx:alpine
|
||||
ports:
|
||||
- "8080:80" # Access via VM-IP:8080
|
||||
volumes:
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
depends_on:
|
||||
- backend
|
||||
- frontend
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
scheduler-db-dev:
|
||||
+2
-5
@@ -3,7 +3,6 @@ services:
|
||||
build:
|
||||
context: ./backend
|
||||
dockerfile: Dockerfile
|
||||
container_name: scheduler-backend
|
||||
environment:
|
||||
HOST_BROWSE_ROOT: ${HOST_BROWSE_ROOT}
|
||||
HOST_MOUNT_ROOT: /host
|
||||
@@ -18,7 +17,7 @@ services:
|
||||
DEFAULT_VIEWER_PASSWORD: ${DEFAULT_VIEWER_PASSWORD}
|
||||
volumes:
|
||||
- ${HOST_BROWSE_ROOT}:/host
|
||||
- scheduler-db:/app/runtime
|
||||
- scheduler-db:/app/data
|
||||
expose:
|
||||
- "8000"
|
||||
restart: unless-stopped
|
||||
@@ -27,7 +26,6 @@ services:
|
||||
build:
|
||||
context: ./frontend
|
||||
dockerfile: Dockerfile
|
||||
container_name: scheduler-frontend
|
||||
depends_on:
|
||||
- backend
|
||||
expose:
|
||||
@@ -35,9 +33,8 @@ services:
|
||||
restart: unless-stopped
|
||||
scheduler-nginx:
|
||||
image: nginx:alpine
|
||||
container_name: scheduler-nginx
|
||||
ports:
|
||||
- "8080:80" # Access via VM-IP:8080
|
||||
- "8453:80" # Access via VM-IP:8453
|
||||
volumes:
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
depends_on:
|
||||
|
||||
Reference in New Issue
Block a user