From 2c845dbdfd571d26a30203da5a024fd8608428d2 Mon Sep 17 00:00:00 2001 From: pptx704 Date: Mon, 21 Jul 2025 16:55:56 +0300 Subject: [PATCH] Updated templates --- app/schemas.py | 5 ++--- docker-compose.prod.yml | 37 +++++++++++++++++++++++++++++++++++++ docker-compose.yml | 2 -- 3 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 docker-compose.prod.yml diff --git a/app/schemas.py b/app/schemas.py index b7ab9b1..69d198b 100644 --- a/app/schemas.py +++ b/app/schemas.py @@ -3,7 +3,7 @@ import enum import uuid from typing import List, Optional -from pydantic import BaseModel, EmailStr +from pydantic import BaseModel, ConfigDict, EmailStr class BaseResponse(BaseModel): @@ -13,5 +13,4 @@ class BaseResponse(BaseModel): class User(BaseModel): id: uuid.UUID - class Config: - orm_mode = True + model_config = ConfigDict(from_attributes=True, extra="ignore") diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 0000000..e8483dc --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,37 @@ +services: + backend: + image: fastapi + build: + context: . + dockerfile: Dockerfile + ports: + - "8000:8000" + environment: + - JWT_SECRET=${JWT_SECRET} + - JWT_ALGORITHM=${JWT_ALGORITHM:-HS256} + - JWT_EXPIRE_MINUTES=${JWT_EXPIRE_MINUTES:-60} + - SQLALCHEMY_DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB} + - WAIT_HOSTS=db:5432 + depends_on: + db: + condition: service_healthy + restart: unless-stopped + env_file: + - .env + + db: + image: postgres:15.3 + environment: + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DB=${POSTGRES_DB} + volumes: + - ./docker-data/postgres:/var/lib/postgresql/data + restart: unless-stopped + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] + interval: 5s + timeout: 5s + retries: 5 + env_file: + - .env diff --git a/docker-compose.yml b/docker-compose.yml index d57563a..f6720e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,8 +27,6 @@ services: - POSTGRES_DB=${POSTGRES_DB} ports: - "5432:5432" - volumes: - - ./docker-data/postgres:/var/lib/postgresql/data restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]