Fix Docker deployment: Update settings.py defaults and Dockerfile for proper environment variable handling
- Updated settings.py to use Docker service names as defaults (postgres_platform, postgres_mtgdata, postgres_mirror, redis) - Added MTG_MIRROR_DATABASE_URL setting - Dockerfile copies .env file into container for pydantic-settings - Entry point script handles dependency checking and migrations before app startup
This commit is contained in:
+2
-1
@@ -54,7 +54,8 @@ COPY --chown=appuser:appuser alembic/ ./alembic/
|
|||||||
COPY --chown=appuser:appuser scripts/ ./scripts/
|
COPY --chown=appuser:appuser scripts/ ./scripts/
|
||||||
RUN chmod +x /app/scripts/*.py /app/scripts/docker-entrypoint.sh
|
RUN chmod +x /app/scripts/*.py /app/scripts/docker-entrypoint.sh
|
||||||
|
|
||||||
# Copy environment example
|
# Copy environment files
|
||||||
|
COPY --chown=appuser:appuser .env ./.env
|
||||||
COPY --chown=appuser:appuser .env.example ./.env.example
|
COPY --chown=appuser:appuser .env.example ./.env.example
|
||||||
COPY --chown=appuser:appuser pyproject.toml ./
|
COPY --chown=appuser:appuser pyproject.toml ./
|
||||||
|
|
||||||
|
|||||||
@@ -19,13 +19,16 @@ class Settings(BaseSettings):
|
|||||||
JWT_SECRET_KEY: str = "change-me-in-production"
|
JWT_SECRET_KEY: str = "change-me-in-production"
|
||||||
|
|
||||||
# Database - Primary (mtgonline app)
|
# Database - Primary (mtgonline app)
|
||||||
DATABASE_URL: str = "postgresql+asyncpg://postgres:postgres@localhost:5432/mtgo_platform"
|
DATABASE_URL: str = "postgresql+asyncpg://postgres:postgres@postgres_platform:5432/mtgo_platform"
|
||||||
|
|
||||||
# Database - Secondary (mtgjson data)
|
# Database - Secondary (mtgjson data)
|
||||||
MTG_DATABASE_URL: str = "postgresql+asyncpg://postgres:postgres@localhost:5432/mtg_data"
|
MTG_DATABASE_URL: str = "postgresql+asyncpg://postgres:postgres@postgres_mtgdata:5432/mtgdata"
|
||||||
|
|
||||||
|
# Database - Mirror
|
||||||
|
MTG_MIRROR_DATABASE_URL: str = "postgresql+asyncpg://postgres:postgres@postgres_mirror:5432/mtgo_mirror"
|
||||||
|
|
||||||
# Redis
|
# Redis
|
||||||
REDIS_URL: str = "redis://localhost:6379/0"
|
REDIS_URL: str = "redis://redis:6379/0"
|
||||||
|
|
||||||
# JWT Configuration
|
# JWT Configuration
|
||||||
JWT_ALGORITHM: str = "HS256"
|
JWT_ALGORITHM: str = "HS256"
|
||||||
|
|||||||
Reference in New Issue
Block a user