From e57be4cbdab93d0e68df60a2d554eb0ded21ba00 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Fri, 2 Jan 2026 20:11:41 +0100 Subject: [PATCH] Updated paths --- Dockerfile | 14 +++++++------- backend/db.py | 2 +- backend/main.py | 2 +- docker-compose.yaml | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 229f7e6..92bfa6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,21 @@ # Dockerfile FROM python:3.12-slim -WORKDIR /app +WORKDIR /var/www/network-manager # Install dependencies RUN pip install --no-cache-dir fastapi uvicorn[standard] # Copy backend and frontend -COPY backend/ /app/backend/ -COPY frontend/ /app/frontend/ +COPY backend/ /var/www/network-manager/backend/ +COPY frontend/ /var/www/network-manager/frontend/ # Default environment variables ENV DB_PATH=/data/database.db -ENV APP_PORT=8000 +ENV HTTP_PORT=8000 -# Expose the port dynamically (Docker ignores env here but it's good documentation) -EXPOSE ${APP_PORT} +# Expose the port dynamically +EXPOSE ${HTTP_PORT} # Use the env var in the startup command -CMD ["sh", "-c", "uvicorn backend.main:app --host 0.0.0.0 --port ${APP_PORT}"] +CMD ["sh", "-c", "uvicorn backend.main:app --host 0.0.0.0 --port ${HTTP_PORT}"] diff --git a/backend/db.py b/backend/db.py index 50a477a..292bd5f 100644 --- a/backend/db.py +++ b/backend/db.py @@ -2,7 +2,7 @@ import sqlite3 import os import ipaddress -DB_PATH = os.environ.get("DB_PATH", "/app/database.db") +DB_PATH = os.environ.get("DB_PATH", "/data/database.db") # ----------------------------- # Connect to the database diff --git a/backend/main.py b/backend/main.py index ac2f18f..498653f 100644 --- a/backend/main.py +++ b/backend/main.py @@ -27,7 +27,7 @@ app.add_middleware( # FRONTEND PATHS (absolute paths inside Docker) # --------------------------------------------------------- -FRONTEND_DIR = "/app/frontend" +FRONTEND_DIR = "/var/www/network-manager/frontend" # Homepage @app.get("/") diff --git a/docker-compose.yaml b/docker-compose.yaml index 92e37c8..0fbfbd2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,6 +8,7 @@ services: environment: - TZ=${DOCKER_TZ} - DB_PATH=/data/database.db + - HTTP_PORT=8000 volumes: - ${DOCKER_CFG_DIR}/network:/data networks: -- 2.47.3