update

.dockerignore

@@ -0,0 +1,60 @@
+# Git
+.git
+.gitignore
+
+# Node modules
+node_modules
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Next.js
+.next/
+out/
+build/
+
+# Python
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+.Python
+env/
+venv/
+.venv/
+pip-log.txt
+pip-delete-this-directory.txt
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Logs
+*.log
+
+# Environment files (will be copied explicitly)
+.env*
+!.env.example
+
+# Cache
+.cache/
+.npm/
+.eslintcache
+
+# Coverage
+coverage/
+.nyc_output/
+
+# Documentation
+*.md
+!README.md
+
+# Temporary files
+*.tmp
+*.temp

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

Dockerfile

@@ -1,63 +1,69 @@
-# Multi-stage Dockerfile to run both frontend (Next.js) and backend (FastAPI) in a single container
+# Multi-stage build for the application
+FROM node:18-alpine AS frontend-builder
 
-# Stage 1: Build the Next.js frontend as static export
-FROM node:20-bullseye AS frontend-builder
+# Set working directory for frontend build
 WORKDIR /app/frontend
-ENV NEXT_TELEMETRY_DISABLED=1
 
-# Copy BOTH package.json and package-lock.json explicitly
-COPY metsa-frontend/package.json ./package.json
-COPY metsa-frontend/package-lock.json ./package-lock.json
+# Copy frontend package files
+COPY metsa-frontend/package*.json ./
 
-# Install dependencies with npm ci
-RUN npm ci
+# Install frontend dependencies
+RUN npm install --force
 
-# Copy all frontend source files
-COPY metsa-frontend/ .
+# Copy frontend source code
+COPY metsa-frontend/ ./
 
-# Build Next.js (output: 'export' is already in next.config.ts, so it will create /out directory)
+# Build frontend
 RUN npm run build
 
-# Stage 2: Final runtime with Node + Python
-FROM node:20-bullseye AS runtime
+# Python dependencies stage
+FROM python:3.11-slim AS python-deps
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    gcc \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set working directory
+WORKDIR /app
+
+# Copy backend requirements
+COPY requirements.txt ./
+
+# Install Python dependencies
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Final stage - Python runtime
+FROM python:3.11-slim
+
+# Install only runtime dependencies
+RUN apt-get update && apt-get install -y \
+    libpq5 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Set working directory
 WORKDIR /app
-ENV NODE_ENV=production
-ENV NEXT_TELEMETRY_DISABLED=1
-
-# 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 - 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
-
-# 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
-
-# Copy Next.js static export from builder stage
-COPY --from=frontend-builder /app/frontend/out ./metsa-frontend/out
-
-# Copy and prepare startup script
-COPY scripts/start.sh ./scripts/start.sh
-RUN chmod +x ./scripts/start.sh
-
-# Set Python path
-ENV PYTHONPATH=/app/metsa-backend
-
-# Expose port
+
+# Copy installed packages from python-deps stage
+COPY --from=python-deps /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
+COPY --from=python-deps /usr/local/bin /usr/local/bin
+
+# Copy backend application code
+COPY metsa-backend/ ./
+
+# Copy built frontend files from the builder stage to static directory
+COPY --from=frontend-builder /app/frontend/out ./static
+
+# Create uploads directory structure
+RUN mkdir -p uploads/commercial \
+    && mkdir -p uploads/compliance \
+    && mkdir -p uploads/other
+
+# Set environment variable for port
+ENV PORT=8000
+
+# Expose the port
 EXPOSE 8000
 
 # Start the application
-CMD ["/bin/bash", "/app/scripts/start.sh"]
+CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8000"]

scripts/build_frontend.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-cd /app/metsa-frontend
-export NEXT_TELEMETRY_DISABLED=1
-npm ci
-npm run build
-# Remove the npm run export line - not needed with output: 'export'

scripts/start.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "Starting FastAPI backend..."
-. /app/venv/bin/activate
-cd /app/metsa-backend
-exec python -m uvicorn app.main:app --host 0.0.0.0 --port 8000