diff --git a/Dockerfile b/Dockerfile index db650c9..e6d69bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ COPY routers/ ./routers/ COPY llm_providers/ ./llm_providers/ COPY stealth_scripts/ ./stealth_scripts/ COPY templates/ ./templates/ -RUN mkdir -p /app/sessions +RUN mkdir -p /app/sessions /root/.pry EXPOSE 8002 HEALTHCHECK --interval=15s --timeout=5s --start-period=10s --retries=3 \ diff --git a/alembic/env.py b/alembic/env.py index b277d38..e260ebe 100644 --- a/alembic/env.py +++ b/alembic/env.py @@ -4,16 +4,15 @@ from logging.config import fileConfig from sqlalchemy import engine_from_config, pool from alembic import context -from db import Base +from db import Base, _resolve_database_url config = context.config if config.config_file_name is not None: fileConfig(config.config_file_name) -db_url = os.getenv("PRY_DATABASE_URL") -if db_url is not None: - config.set_main_option("sqlalchemy.url", db_url) +# Always use the same URL resolution logic as the application. +config.set_main_option("sqlalchemy.url", os.getenv("PRY_DATABASE_URL") or _resolve_database_url()) target_metadata = Base.metadata exclude_tables = {"spatial_ref_sys"} diff --git a/docker-compose.yml b/docker-compose.yml index 136b0c8..9d5765c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,9 @@ services: ports: - "127.0.0.1:8005:8002" volumes: + - pry-data:/root/.pry - pry-sessions:/app/sessions + env_file: .env environment: - PYTHONUNBUFFERED=1 - PRY_TIMEOUT=60 @@ -44,7 +46,7 @@ services: container_name: pry-flaresolverr restart: unless-stopped ports: - - "127.0.0.1:8191:8191" + - "127.0.0.1:8192:8191" environment: - LOG_LEVEL=info - CAPTCHA_SOLVER=none @@ -76,4 +78,5 @@ services: - tor volumes: + pry-data: pry-sessions: