update

Dockerfile

@@ -1,57 +1,62 @@
 # Multi-stage Dockerfile to run both frontend (Next.js) and backend (FastAPI) in a single container
 
-# 1) Build the Next.js frontend as static export
+# Stage 1: Build the Next.js frontend as static export
 FROM node:20-bullseye AS frontend-builder
 WORKDIR /app/frontend
 ENV NEXT_TELEMETRY_DISABLED=1
 
-# Install deps first (better cache)
-COPY metsa-frontend/package*.json ./
-RUN npm ci
+# Copy package files (ensure package-lock.json exists)
+COPY metsa-frontend/package.json ./package.json
+# Generate package-lock.json if it doesn't exist
+RUN npm install
 
-# Copy source and build + export
+# Copy all frontend source files
 COPY metsa-frontend/ .
-RUN npm run build && npm run export
 
-# 2) Final runtime: Node + Python in one image
+# Build the Next.js app (with static export configured in next.config.ts)
+RUN npm run build
+
+# Stage 2: Final runtime with Node + Python
 FROM node:20-bullseye AS runtime
 WORKDIR /app
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
 
-# Install Python and build tools required by some Python packages
+# Install Python and required build tools
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
        python3 python3-pip python3-venv \
        build-essential python3-dev libffi-dev libssl-dev \
   && rm -rf /var/lib/apt/lists/*
 
-# ---- Backend setup ----
-# Copy backend code and install Python deps into a venv
-COPY metsa-backend/ ./metsa-backend/
+# Backend setup - create venv and install dependencies
+COPY metsa-backend/requirements.txt ./metsa-backend/requirements.txt
 RUN python3 -m venv /app/venv \
   && . /app/venv/bin/activate \
   && pip install --upgrade pip \
   && pip install --no-cache-dir -r metsa-backend/requirements.txt
 
-# Ensure uploads directory exists
-RUN mkdir -p metsa-backend/uploads
+# Copy backend code
+COPY metsa-backend/ ./metsa-backend/
+
+# Ensure uploads directory exists with proper subdirectories
+RUN mkdir -p metsa-backend/uploads/commercial \
+  && mkdir -p metsa-backend/uploads/compliance \
+  && mkdir -p metsa-backend/uploads/other
 
-# ---- Frontend setup ----
-# Copy Next.js exported static site into backend-served directory
-WORKDIR /app
+# Copy Next.js static export from builder stage
 COPY --from=frontend-builder /app/frontend/out ./metsa-frontend/out
 
-# ---- App startup ----
-WORKDIR /app
+# Copy and prepare startup script
 COPY scripts/start.sh ./scripts/start.sh
 RUN chmod +x ./scripts/start.sh
 
-# Default port (single port)
-EXPOSE 8000
-
-# API URL used by frontend static site
+# Set environment variables
 ENV NEXT_PUBLIC_API_URL="http://localhost:8000/api/v1"
+ENV PYTHONPATH=/app/metsa-backend
 
-CMD ["/bin/bash", "/app/scripts/start.sh"]
+# Expose port
+EXPOSE 8000
 
+# Start the application
+CMD ["/bin/bash", "/app/scripts/start.sh"]

docker-compose.yml

@@ -1,15 +1,43 @@
-version: "3.9"
+version: '3.8'
+
 services:
   app:
-    build: .
-    container_name: metsa-app
+    build:
+      context: .
+      dockerfile: Dockerfile
     ports:
       - "8000:8000"
     environment:
+      - NODE_ENV=production
       - NEXT_PUBLIC_API_URL=http://localhost:8000/api/v1
-      - PYTHONDONTWRITEBYTECODE=1
-      - PYTHONUNBUFFERED=1
+      - DATABASE_URL=mongodb://mongo:27017/metsa
+      - SECRET_KEY=your-secret-key-change-in-production
+      - ALGORITHM=HS256
+      - ACCESS_TOKEN_EXPIRE_MINUTES=30
     volumes:
       - ./metsa-backend/uploads:/app/metsa-backend/uploads
-    restart: unless-stopped
+      - ./metsa-backend/.env:/app/metsa-backend/.env
+    depends_on:
+      - mongo
+    networks:
+      - metsa-network
+
+  mongo:
+    image: mongo:7.0
+    ports:
+      - "27017:27017"
+    volumes:
+      - mongo-data:/data/db
+    environment:
+      - MONGO_INITDB_ROOT_USERNAME=admin
+      - MONGO_INITDB_ROOT_PASSWORD=admin123
+      - MONGO_INITDB_DATABASE=metsa
+    networks:
+      - metsa-network
+
+volumes:
+  mongo-data:
 
+networks:
+  metsa-network:
+    driver: bridge

requirements.txt

@@ -0,0 +1,13 @@
+fastapi==0.104.1
+uvicorn==0.24.0
+pymongo==4.5.0
+motor==3.3.2
+python-jose[cryptography]==3.3.0
+passlib[bcrypt]==1.7.4
+python-multipart==0.0.6
+python-dotenv==1.0.0
+pydantic==2.4.2
+pydantic[email]==2.4.2
+pydantic-settings==2.0.3
+aiofiles==23.2.1
+python-dateutil==2.8.2

scripts/start.sh

@@ -1,18 +1,7 @@
-#!/usr/bin/env bash
-set -euo pipefail
+#!/bin/bash
+set -e
 
-# Activate Python venv
-source /app/venv/bin/activate
-
-# Run backend (FastAPI) in background on :8000
-# Note: Using 0.0.0.0 so it's reachable from the frontend container process
+echo "Starting FastAPI backend..."
+. /app/venv/bin/activate
 cd /app/metsa-backend
-uvicorn app.main:app --host 0.0.0.0 --port 8000 &
-BACK_PID=$!
-cd /app
-
-echo "Backend started with PID ${BACK_PID}"
-
-# We now serve the frontend statically from FastAPI (same port). Nothing else to run here.
-wait ${BACK_PID}
-
+exec python -m uvicorn app.main:app --host 0.0.0.0 --port 8000