diff --git a/src/fastapi_app/.env.example b/src/fastapi_app/.env.example index 8f0c6c9..2651cfd 100644 --- a/src/fastapi_app/.env.example +++ b/src/fastapi_app/.env.example @@ -1,8 +1,8 @@ -DB_HOST=db -DB_PORT=5432 -DB_USER=user -DB_PASSWORD=Qwe123 -DB_NAME=api_db +POSTGRES_HOST=db +POSTGRES_PORT=5432 +POSTGRES_USER=user +POSTGRES_PASSWORD=Qwe123 +POSTGRES_NAME=api_db API_HOST=0.0.0.0 API_PORT=8000 diff --git a/src/fastapi_app/docker-compose.dev.yml b/src/fastapi_app/docker-compose.dev.yml index 005a3b4..e38d4e4 100644 --- a/src/fastapi_app/docker-compose.dev.yml +++ b/src/fastapi_app/docker-compose.dev.yml @@ -4,13 +4,13 @@ services: db: image: postgres:15.2 environment: - POSTGRES_USER: ${DB_USER} - POSTGRES_PASSWORD: ${DB_PASSWORD} - POSTGRES_DB: ${DB_NAME} + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${POSTGRES_NAME} env_file: - .env ports: - - "${DB_PORT}:${DB_PORT}" + - "${POSTGRES_PORT}:${POSTGRES_PORT}" volumes: - postgres_data:/var/lib/postgresql/data/ restart: always diff --git a/src/fastapi_app/docker-compose.yml b/src/fastapi_app/docker-compose.yml index 4883e59..08ef87e 100644 --- a/src/fastapi_app/docker-compose.yml +++ b/src/fastapi_app/docker-compose.yml @@ -4,9 +4,9 @@ services: db: image: postgres:15.2 environment: - POSTGRES_USER: ${DB_USER} - POSTGRES_PASSWORD: ${DB_PASSWORD} - POSTGRES_DB: ${DB_NAME} + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${POSTGRES_NAME} env_file: - .env ports: diff --git a/src/fastapi_app/lib/app/split_settings/postgres.py b/src/fastapi_app/lib/app/split_settings/postgres.py index eaaec62..62452f6 100644 --- a/src/fastapi_app/lib/app/split_settings/postgres.py +++ b/src/fastapi_app/lib/app/split_settings/postgres.py @@ -7,7 +7,7 @@ import lib.app.split_settings.utils as app_split_settings_utils class PostgresSettings(pydantic_settings.BaseSettings): model_config = pydantic_settings.SettingsConfigDict( env_file=app_split_settings_utils.ENV_PATH, - env_prefix="DB_", + env_prefix="POSTGRES_", env_file_encoding="utf-8", extra="ignore", ) @@ -17,5 +17,5 @@ class PostgresSettings(pydantic_settings.BaseSettings): port: int = 5432 user: str = "app" password: pydantic.SecretStr = pydantic.Field( - default=..., validation_alias=pydantic.AliasChoices("password", "db_password") + default=..., validation_alias=pydantic.AliasChoices("password", "postgres_password") )