From b6db797becca02fca55adc393fc0de074ede466e Mon Sep 17 00:00:00 2001 From: Baptiste-Ferrand Date: Wed, 30 Jul 2025 16:49:03 +0200 Subject: [PATCH 1/3] fix dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8bacea5..d662081 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,4 +21,4 @@ RUN uv sync EXPOSE 8000 -CMD ["uv", "run", "uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file +CMD ["uv", "run", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] \ No newline at end of file From 1445b56c842355679ebd1bafbabe69d47ac002ce Mon Sep 17 00:00:00 2001 From: Baptiste-Ferrand Date: Wed, 30 Jul 2025 16:49:32 +0200 Subject: [PATCH 2/3] update docker compose for build backend for dev --- docker-compose.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index a077849..4e91f89 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,4 +11,17 @@ services: POSTGRES_PASSWORD: user POSTGRES_DB: postgres volumes: - - postgres_data:/var/lib/postgresql/data \ No newline at end of file + - postgres_data:/var/lib/postgresql/data + + backend: + build: + context: . + dockerfile: Dockerfile + container_name: trackntrain_backend + ports: + - '8000:8000' + environment: + ENV: prod + SECRET_KEY: 123456789 + ACCESS_TOKEN_EXPIRE_MINUTES: 60 + DATABASE_URL: postgresql://user:user@91.169.178.154:5400/postgres \ No newline at end of file From aed93de615157518bbd8be0133fbe5e4aaa5209e Mon Sep 17 00:00:00 2001 From: Baptiste-Ferrand Date: Wed, 30 Jul 2025 16:50:31 +0200 Subject: [PATCH 3/3] also add cors origin configuration for frontend (dev for now) --- src/main.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main.py b/src/main.py index 1ff7715..47fbcde 100644 --- a/src/main.py +++ b/src/main.py @@ -1,5 +1,5 @@ from fastapi import FastAPI -from fastapi.middleware import Middleware +from fastapi.middleware.cors import CORSMiddleware from src.entrypoints.api.routers.profile import router as profile_router from src.entrypoints.api.routers.group import router as group_router @@ -13,6 +13,22 @@ version="0.1.0", ) +origins = [ + "http://localhost:3000", + "http://127.0.0.1:3000" + "http://localhost:8000", + "http://localhost:5173", + "http://127.0.0.1:8000", + "http://127.0.0.1:5173" +] + +app.add_middleware( + CORSMiddleware, + allow_origins=origins, + allow_credentials=True, + allow_methods=["*"], + allow_headers=["*"], +) app.include_router(profile_router) app.include_router(group_router)