Update Dockerfile for correct directory structure

Dockerfile

@@ -1,50 +1,77 @@
-# Use Node.js as base image since it's needed for the web build
-FROM node:20.11-alpine3.19 AS web-builder
+# Base stage with shared configuration
+FROM node:20.11-alpine3.19 AS base
 
-# Set working directory for web
-WORKDIR /app/web
+# Configure build environment
+ENV NODE_OPTIONS="--max_old_space_size=2048" \
+    NEXT_TELEMETRY_DISABLED=1 \
+    NODE_ENV=production \
+    PYTHONDONTWRITEBYTECODE=1 \
+    POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_CREATE=false \
+    POETRY_CACHE_DIR=/cache/poetry
 
-# Copy package files first
-COPY web/package.json web/yarn.lock ./
+# Web builder stage
+FROM base AS web-builder
+
+WORKDIR /app/web
 
-# Configure Node to use less memory and disable telemetry
-ENV NODE_OPTIONS="--max_old_space_size=2048"
-ENV NEXT_TELEMETRY_DISABLED=1
-ENV NODE_ENV=production
+# Setup build cache
+RUN --mount=type=cache,target=/root/.yarn \
+    --mount=type=cache,target=/root/.npm \
+    yarn config set cache-folder /root/.yarn && \
+    npm config set cache /root/.npm
 
-# Install ALL dependencies (including dev dependencies) needed for build
-RUN yarn install --frozen-lockfile --network-timeout 300000 && \
+# Copy package files and install dependencies
+COPY web/package.json web/yarn.lock ./
+RUN --mount=type=cache,target=/root/.yarn \
+    --mount=type=cache,target=/root/.npm \
+    yarn install --frozen-lockfile --network-timeout 300000 && \
     yarn add code-inspector-plugin
 
-# Copy web source files
+# Copy source and build
 COPY web/ .
-
-# Build web app
 RUN yarn build
 
-# Python base image for final stage
+# Python builder stage
+FROM python:3.10-slim-bookworm AS python-builder
+
+# Install build dependencies
+RUN --mount=type=cache,target=/var/cache/apt \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app/api
+
+# Install and configure poetry
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install --no-cache-dir poetry
+
+# Copy Python files and install dependencies
+COPY api/pyproject.toml api/poetry.lock ./
+RUN --mount=type=cache,target=/root/.cache/pypoetry \
+    poetry config virtualenvs.create false && \
+    poetry install --no-dev --no-interaction --no-ansi
+
+# Final stage
 FROM python:3.10-slim-bookworm
 
-# Install only essential dependencies
-RUN apt-get update && apt-get install -y \
+# Install runtime dependencies
+RUN --mount=type=cache,target=/var/cache/apt \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
     nodejs \
     npm \
-    --no-install-recommends && \
-    rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/*
 
-# Set working directory
 WORKDIR /app
 
-# Copy API files
+# Copy Python environment
+COPY --from=python-builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
 COPY api/ /app/api/
 
-# Install Python dependencies
-WORKDIR /app/api
-RUN pip install --no-cache-dir poetry && \
-    poetry config virtualenvs.create false && \
-    poetry install --no-dev
-
-# Copy built web files from builder stage
+# Copy web build artifacts
 COPY --from=web-builder /app/web/.next /app/web/.next
 COPY --from=web-builder /app/web/public /app/web/public
 COPY --from=web-builder /app/web/node_modules /app/web/node_modules
@@ -63,9 +90,8 @@ ENV FLASK_APP=app.py \
 # Expose ports
 EXPOSE 3000 5001
 
-# Copy and setup entrypoint script
+# Setup entrypoint
 COPY docker/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
-# Start services
 CMD ["/entrypoint.sh"]