Update Dockerfile for correct directory structure

.dockerignore

@@ -1,10 +1,53 @@
+# Version control
 .git
 .gitignore
-node_modules
+.gitattributes
+
+# Dependencies
 **/node_modules
-**/__pycache__
-*.pyc
-.next
-.env
-.env.*
-!.env.example 
+**/.pnp
+**/.pnp.js
+**/yarn.lock
+**/package-lock.json
+
+# Testing
+**/coverage
+
+# Next.js
+**/.next/
+**/out/
+**/build
+**/.swc/
+
+# Python
+**/__pycache__/
+**/*.py[cod]
+**/*$py.class
+**/*.so
+**/.Python
+**/env/
+**/build/
+**/develop-eggs/
+**/dist/
+**/downloads/
+**/eggs/
+**/.eggs/
+**/lib/
+**/lib64/
+**/parts/
+**/sdist/
+**/var/
+**/wheels/
+**/*.egg-info/
+**/.installed.cfg
+**/*.egg
+
+# IDE
+.idea
+.vscode
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db

Dockerfile

@@ -3,11 +3,6 @@
 # ============================================
 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 \
@@ -19,30 +14,31 @@ ENV NODE_OPTIONS="--max_old_space_size=3072" \
 # ============================================
 FROM base AS deps
 
-WORKDIR /app/web
+WORKDIR /app
 
 # Copy only package files for better caching
-COPY web/package.json web/pnpm-lock.yaml ./
+COPY package.json yarn.lock ./
 
-# Use pnpm with store cache for faster installs
-RUN --mount=type=cache,target=/root/.local/share/pnpm/store \
-    pnpm install --frozen-lockfile --prod=false
+# Use yarn with cache for faster installs
+RUN --mount=type=cache,target=/usr/local/share/.cache/yarn \
+    yarn config set cache-folder /usr/local/share/.cache/yarn && \
+    yarn install --frozen-lockfile --network-timeout 300000
 
 # ============================================
 # Builder stage - builds Next.js application
 # ============================================
 FROM deps AS web-builder
 
-WORKDIR /app/web
+WORKDIR /app
 
 # Copy source files
-COPY web/ .
+COPY . .
 
 # Install dev dependencies needed for build
-RUN pnpm add -D autoprefixer postcss tailwindcss code-inspector-plugin
+RUN yarn add --dev autoprefixer postcss tailwindcss code-inspector-plugin
 
 # Build with standalone output
-RUN pnpm build
+RUN yarn build
 
 # ============================================
 # Python builder stage - builds Python deps
@@ -55,14 +51,14 @@ RUN apt-get update && \
     build-essential \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /app/api
+WORKDIR /app
 
 # 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 ./
+COPY pyproject.toml poetry.lock ./
 RUN poetry config virtualenvs.create false && \
     poetry install --no-dev --no-interaction --no-ansi
 
@@ -79,6 +75,7 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     nodejs \
     npm \
+    curl \
     && rm -rf /var/lib/apt/lists/*
 
 # Set up directory structure
@@ -96,12 +93,12 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 
 # 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 --chown=user . /app/
 
 # 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/.next/standalone /app/web
+COPY --from=web-builder --chown=user /app/.next/static /app/web/.next/static
+COPY --from=web-builder --chown=user /app/public /app/web/public
 
 # Set environment variables
 ENV FLASK_APP=app.py \