diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..872339c --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +app/__pycache__ \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..872339c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +app/__pycache__ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 557468d..55f5efe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,10 +13,10 @@ COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt # Copy project files -COPY /app ./app +COPY /app . # Expose port EXPOSE 8000 # Run the app with Uvicorn -CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] +CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] diff --git a/app/__pycache__/main.cpython-313.pyc b/app/__pycache__/main.cpython-313.pyc index ec2aeea..a2af012 100644 Binary files a/app/__pycache__/main.cpython-313.pyc and b/app/__pycache__/main.cpython-313.pyc differ diff --git a/app/main.py b/app/main.py index b7c5737..b8519f6 100644 --- a/app/main.py +++ b/app/main.py @@ -4,13 +4,12 @@ from fastapi.templating import Jinja2Templates from fastapi.staticfiles import StaticFiles from fastapi.concurrency import run_in_threadpool from pathlib import Path -import app.download as download -import json +import json, download app = FastAPI() -app.mount("/static", StaticFiles(directory="/app/app/static"), name="static") -templates = Jinja2Templates(directory="/app/app/templates") +# app.mount("/static", StaticFiles(directory="/app/app/static"), name="static") +templates = Jinja2Templates(directory="templates") # api @@ -24,7 +23,7 @@ async def dropoutUpdate(): @app.get("/dropoutSeries", response_class=JSONResponse) async def dropoutSeries(): - file_path = Path("/data/dropout.json") + file_path = Path("data/dropout.json") if file_path.exists(): with file_path.open("r", encoding="utf-8") as f: data = json.load(f)