From d748b658b4761e4c64cbf7a562d7dc21a7beac0d Mon Sep 17 00:00:00 2001 From: sstent Date: Sun, 28 Sep 2025 15:01:39 -0700 Subject: [PATCH] added alembic database migrations, json import/export --- Dockerfile | 17 ++--------------- main.py | 3 ++- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index a50513e..de1b2f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,8 +28,6 @@ FROM python:3.11-slim RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* -# Create a non-root user -#RUN groupadd -r appuser && useradd -r -g appuser appuser # Set working directory WORKDIR /app @@ -40,19 +38,12 @@ COPY --from=builder /app/venv /app/venv # Activate the virtual environment ENV PATH="/app/venv/bin:$PATH" -# Create data directory and set permissions -#RUN mkdir -p /app/data && \ -# chown -R appuser:appuser /app/data +# Create data directory +RUN mkdir -p /app/data # Copy application code COPY . . -# Ensure appuser owns all files -#RUN chown -R appuser:appuser /app - -# Switch to non-root user -#USER appuser - # Set working directory to /app for the application WORKDIR /app @@ -60,10 +51,6 @@ WORKDIR /app ENV DATABASE_PATH=/app/data ENV DATABASE_URL=sqlite:////app/data/meal_planner.db -# Verify directory ownership (for debugging) -RUN ls -ld /app/data && \ - touch /app/data/test_write.txt && \ - echo "Write test successful" > /app/data/test_write.txt # Expose port (as defined in main.py) EXPOSE 8999 diff --git a/main.py b/main.py index 8f5efed..69d5ace 100644 --- a/main.py +++ b/main.py @@ -31,7 +31,8 @@ logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %( # Database setup - Use SQLite for easier setup # Use environment variables if set, otherwise use defaults -DATABASE_PATH = os.getenv('DATABASE_PATH', '/app/data') +# Use current directory for database +DATABASE_PATH = os.getenv('DATABASE_PATH', '.') DATABASE_URL = os.getenv('DATABASE_URL', f'sqlite:///{DATABASE_PATH}/meal_planner.db') logging.info(f"Database URL: {DATABASE_URL}")