Update Dockerfile for correct directory structure

Dockerfile

@@ -1,34 +1,52 @@
-# Base stage with shared configuration
+# ============================================
+# Base stage for shared configuration
+# ============================================
 FROM node:20.11-alpine3.19 AS base
 
+# Use BuildKit's cache mount to speed up installations
+RUN --mount=type=cache,target=/root/.npm \
+    npm set cache /root/.npm && \
+    npm install -g pnpm
+
 # Configure build environment with optimized settings
 ENV NODE_OPTIONS="--max_old_space_size=3072" \
     NEXT_TELEMETRY_DISABLED=1 \
     NODE_ENV=production \
-    PYTHONDONTWRITEBYTECODE=1 \
-    POETRY_NO_INTERACTION=1 \
-    POETRY_VIRTUALENVS_CREATE=false \
-    POETRY_CACHE_DIR=/cache/poetry
+    PYTHONDONTWRITEBYTECODE=1
 
-# Web builder stage
-FROM base AS web-builder
+# ============================================
+# Dependencies stage - caches node_modules
+# ============================================
+FROM base AS deps
 
 WORKDIR /app/web
 
-# Copy package files first
-COPY web/package.json web/yarn.lock ./
+# Copy only package files for better caching
+COPY web/package.json web/pnpm-lock.yaml ./
+
+# Use pnpm with store cache for faster installs
+RUN --mount=type=cache,target=/root/.local/share/pnpm/store \
+    pnpm install --frozen-lockfile --prod=false
 
-# Install only necessary dependencies
-RUN yarn install --frozen-lockfile --production=false --network-timeout 300000 && \
-    yarn add code-inspector-plugin autoprefixer postcss tailwindcss
+# ============================================
+# Builder stage - builds Next.js application
+# ============================================
+FROM deps AS web-builder
 
-# Copy web source files
+WORKDIR /app/web
+
+# Copy source files
 COPY web/ .
 
-# Build with optimized settings
-RUN yarn build
+# Install dev dependencies needed for build
+RUN pnpm add -D autoprefixer postcss tailwindcss code-inspector-plugin
+
+# Build with standalone output
+RUN pnpm build
 
-# Python builder stage
+# ============================================
+# Python builder stage - builds Python deps
+# ============================================
 FROM python:3.10-slim-bookworm AS python-builder
 
 # Install build dependencies
@@ -39,46 +57,53 @@ RUN apt-get update && \
 
 WORKDIR /app/api
 
-# Install poetry and dependencies
-RUN pip install --no-cache-dir poetry
+# Use BuildKit's cache mount for pip
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install --no-cache-dir poetry
+
+# Copy and install Python dependencies
 COPY api/pyproject.toml api/poetry.lock ./
 RUN poetry config virtualenvs.create false && \
     poetry install --no-dev --no-interaction --no-ansi
 
-# Final stage
+# ============================================
+# Final stage - minimal production image
+# ============================================
 FROM python:3.10-slim-bookworm
 
-# Set up user for Hugging Face
+# Create non-root user for HF security
 RUN useradd -m -u 1000 user
 
-# Install runtime dependencies
+# Install only required runtime packages
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     nodejs \
     npm \
     && rm -rf /var/lib/apt/lists/*
 
-# Create app structure
+# Set up directory structure
 WORKDIR /app
 RUN mkdir -p api web && chown -R user:user /app
 
 # Install core Python packages
-RUN pip install --no-cache-dir \
+RUN --mount=type=cache,target=/root/.cache/pip \
+    pip install --no-cache-dir \
     gunicorn \
     gevent \
     flask \
     cloudscraper \
     transformers
 
-# Copy environments and files
+# Copy built files from previous stages
 COPY --from=python-builder --chown=user /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
 COPY --chown=user api/ /app/api/
-COPY --from=web-builder --chown=user /app/web/.next /app/web/.next
+
+# Copy Next.js standalone build
+COPY --from=web-builder --chown=user /app/web/.next/standalone /app/web
+COPY --from=web-builder --chown=user /app/web/.next/static /app/web/.next/static
 COPY --from=web-builder --chown=user /app/web/public /app/web/public
-COPY --from=web-builder --chown=user /app/web/node_modules /app/web/node_modules
-COPY --from=web-builder --chown=user /app/web/package.json /app/web/package.json
 
-# Set core environment variables
+# Set environment variables
 ENV FLASK_APP=app.py \
     EDITION=SELF_HOSTED \
     DEPLOY_ENV=PRODUCTION \
@@ -93,11 +118,20 @@ ENV FLASK_APP=app.py \
     MAIL_TYPE=resend \
     MAIL_RESEND_API_KEY=null
 
+# Switch to non-root user
 USER user
-EXPOSE 7860 3000
 
+# Expose HF Spaces port
+EXPOSE 7860
+
+# Copy and set up entrypoint
 COPY --chown=user docker/entrypoint.sh /app/entrypoint.sh
 RUN chmod +x /app/entrypoint.sh
 
 WORKDIR /app
+
+# Add healthcheck
+HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 \
+    CMD curl -f http://localhost:7860/health || exit 1
+
 CMD ["./entrypoint.sh"]