be/Dockerfile

@@ -49,8 +49,6 @@ COPY --chown=appuser:appuser alembic/ ./alembic/
 COPY --chown=appuser:appuser alembic.ini ./
 COPY --chown=appuser:appuser *.py ./
 COPY --chown=appuser:appuser requirements.txt ./
-COPY --chown=appuser:appuser entrypoint.sh /app/entrypoint.sh
-RUN chmod +x /app/entrypoint.sh
 
 # Create logs directory
 RUN mkdir -p /app/logs && chown -R appuser:appuser /app
@@ -66,7 +64,6 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=30s --retries=3 \
 EXPOSE 8000
 
 # Production command
-ENTRYPOINT ["/app/entrypoint.sh"]
 CMD ["uvicorn", "app.main:app", \
     "--host", "0.0.0.0", \
     "--port", "8000", \

be/alembic/versions/0001_initial_schema.py

@@ -25,7 +25,7 @@ recurrence_type_enum = postgresql.ENUM('DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY', n
 chore_frequency_enum = postgresql.ENUM('one_time', 'daily', 'weekly', 'monthly', 'custom', name='chorefrequencyenum', create_type=False)
 chore_type_enum = postgresql.ENUM('personal', 'group', name='choretypeenum', create_type=False)
 
-def upgrade(context=None) -> None: # Add context=None for compatibility, real arg passed by Alembic
+def upgrade() -> None:
     # Create enums
     user_role_enum.create(op.get_bind(), checkfirst=True)
     split_type_enum.create(op.get_bind(), checkfirst=True)
@@ -280,7 +280,7 @@ def upgrade(context=None) -> None: # Add context=None for compatibility, real ar
     op.create_index(op.f('ix_settlement_activities_paid_by_user_id'), 'settlement_activities', ['paid_by_user_id'], unique=False)
 
 
-def downgrade(context=None) -> None: # Add context=None for compatibility, real arg passed by Alembic
+def downgrade() -> None:
     op.drop_table('settlement_activities')
     op.drop_table('settlements')
     op.drop_table('expense_splits')

be/app/main.py

@@ -242,7 +242,7 @@ async def startup_event():
     logger.info(f"Application startup in {settings.ENVIRONMENT} environment...")
     
     # Run database migrations
-    # await run_migrations()
+    await run_migrations()
     
     # Initialize scheduler
     init_scheduler()

be/entrypoint.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-# Run database migrations
-echo "Running database migrations..."
-alembic upgrade head
-
-# Execute the command passed as arguments to this script
-echo "Starting application..."
-exec "$@"

docker-compose.prod.yml

@@ -1,4 +1,30 @@
 services:
+  db:
+    image: postgres:17-alpine
+    container_name: postgres_db_prod
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+      - ./be/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql:ro
+    networks:
+      - app-network
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}" ]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+    restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          memory: 512M
+        reservations:
+          memory: 256M
+
   backend:
     container_name: fastapi_backend_prod
     build:
@@ -15,7 +41,24 @@ services:
       - ENVIRONMENT=production
       - CORS_ORIGINS=${CORS_ORIGINS}
       - FRONTEND_URL=${FRONTEND_URL}
+    networks:
+      - app-network
+    depends_on:
+      db:
+        condition: service_healthy
     restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          memory: 1G
+        reservations:
+          memory: 512M
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:8000/health" ]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
 
   frontend:
     container_name: frontend_prod
@@ -24,5 +67,44 @@ services:
       dockerfile: Dockerfile.prod
       target: production
     environment:
-      - VITE_API_URL=https://mitlistbe.mohamad.dev
+      - VITE_API_URL=${VITE_API_URL}
+      - VITE_SENTRY_DSN=${VITE_SENTRY_DSN}
+    ports:
+      - "80:3000"
+    networks:
+      - app-network
+    depends_on:
+      - backend
     restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+        reservations:
+          memory: 128M
+
+  redis:
+    image: redis:7-alpine
+    container_name: redis_prod
+    command: redis-server --appendonly yes --requirepass ${REDIS_PASSWORD}
+    volumes:
+      - redis_data:/data
+    networks:
+      - app-network
+    restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+        reservations:
+          memory: 128M
+
+volumes:
+  postgres_data:
+    driver: local
+  redis_data:
+    driver: local
+
+networks:
+  app-network:
+    driver: bridge

docker-compose.yml

@@ -33,7 +33,7 @@ services:
       # Pass the database URL to the backend container
       # Uses the service name 'db' as the host, and credentials defined above
       # IMPORTANT: Use the correct async driver prefix if your app needs it!
-      - DATABASE_URL=postgresql+asyncpg://mitlist_owner:npg_p0SkmyJ6BPWO@ep-small-sound-a9ketcef-pooler.gwc.azure.neon.tech/testnewmig
+      - DATABASE_URL=xxx
       - GEMINI_API_KEY=xxx
       - SECRET_KEY=xxx
       # Add other environment variables needed by the backend here