Update Dockerfile

Dockerfile

@@ -1,81 +1,106 @@
-# Base Python image with correct version
-FROM python:3.12-slim-bookworm AS base
-
-# Set up environment variables according to HF guidelines
-ENV PYTHONDONTWRITEBYTECODE=1 \
-    POETRY_VERSION=1.8.4 \
-    POETRY_HOME=/opt/poetry \
-    POETRY_CACHE_DIR=/tmp/poetry_cache \
+# Base stage with shared configuration
+FROM node:20.11-alpine3.19 AS base
+
+# 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_IN_PROJECT=true \
-    POETRY_VIRTUALENVS_CREATE=true \
-    POETRY_REQUESTS_TIMEOUT=15
+    POETRY_VIRTUALENVS_CREATE=false \
+    POETRY_CACHE_DIR=/cache/poetry
 
-# Create non-root user early (HF requirement)
-RUN useradd -m -u 1000 user
+# Web builder stage
+FROM base AS web-builder
 
-WORKDIR /app/api
+WORKDIR /app/web
+
+# Copy package files first
+COPY web/package.json web/yarn.lock ./
+
+# Install build dependencies globally first
+RUN npm install -g code-inspector-plugin autoprefixer postcss tailwindcss
+
+# Install project dependencies
+RUN yarn install --frozen-lockfile --network-timeout 300000 && \
+    yarn add --dev @types/node @types/react code-inspector-plugin autoprefixer postcss tailwindcss
 
-# Install Poetry and dependencies in a single layer
-RUN pip install --no-cache-dir "poetry==${POETRY_VERSION}" && \
-    apt-get update && \
+# Copy source files
+COPY web/ .
+
+# Build the application with standalone output
+RUN NODE_PATH=/usr/local/lib/node_modules yarn build
+
+# Python builder stage
+FROM python:3.10-slim-bookworm AS python-builder
+
+# Install build dependencies in a single layer
+RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    gcc g++ libc-dev libffi-dev libgmp-dev libmpfr-dev libmpc-dev \
-    postgresql postgresql-contrib curl git nodejs npm && \
-    rm -rf /var/lib/apt/lists/*
-
-# Set up directories and permissions
-RUN mkdir -p /var/run/postgresql /var/lib/postgresql/data /data/storage && \
-    chown -R postgres:postgres /var/run/postgresql /var/lib/postgresql/data && \
-    chmod 2777 /var/run/postgresql && \
-    chmod 700 /var/lib/postgresql/data && \
-    chown -R user:user /app /opt/poetry /tmp/poetry_cache
-
-# Switch to user for Poetry operations
-USER user
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app/api
 
-# Copy dependency files with correct ownership
-COPY --chown=user pyproject.toml poetry.lock poetry.toml ./
+# Install and configure poetry
+RUN pip install --no-cache-dir poetry
 
-# Install Python dependencies
-RUN poetry install --no-root --no-dev
+# Copy Python files and install dependencies
+COPY api/pyproject.toml api/poetry.lock ./
+RUN poetry config virtualenvs.create false && \
+    poetry install --no-dev --no-interaction --no-ansi
 
-# Initialize PostgreSQL as postgres user
-USER postgres
-RUN /usr/lib/postgresql/15/bin/initdb -D /var/lib/postgresql/data && \
-    echo "host all  all    0.0.0.0/0  md5" >> /var/lib/postgresql/data/pg_hba.conf && \
-    echo "listen_addresses='*'" >> /var/lib/postgresql/data/postgresql.conf
+# Final stage
+FROM python:3.10-slim-bookworm
 
-# Switch back to user
-USER user
+# Set up a new user named "user" with user ID 1000 (required by Hugging Face)
+RUN useradd -m -u 1000 user
+
+# Install runtime dependencies in a single layer
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    nodejs \
+    npm \
+    && rm -rf /var/lib/apt/lists/*
 
-# Set up user environment (HF requirement)
-ENV HOME=/home/user \
-    PATH=/home/user/.local/bin:$PATH
+# Create app directory structure
+WORKDIR /app
+RUN mkdir -p api web && chown -R user:user /app
+
+# Copy Python environment and set permissions
+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 source code
-COPY --chown=user . /app/api/
+# Copy web build artifacts with correct permissions
+COPY --from=web-builder --chown=user /app/web/.next /app/web/.next
+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
 
-# Copy entrypoint
-COPY --chown=user /app/api/docker/entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+# Install gunicorn
+RUN pip install --no-cache-dir gunicorn gevent
 
-# Set required environment variables
+# Set environment variables
 ENV FLASK_APP=app.py \
     EDITION=SELF_HOSTED \
     DEPLOY_ENV=PRODUCTION \
-    MODE=api \
-    DB_USERNAME=postgres \
-    DB_PASSWORD=difyai123456 \
-    DB_HOST=localhost \
-    DB_PORT=5432 \
-    DB_DATABASE=dify \
-    MIGRATION_ENABLED=true
+    CONSOLE_API_URL=http://127.0.0.1:7860 \
+    CONSOLE_WEB_URL=http://127.0.0.1:3000 \
+    SERVICE_API_URL=http://127.0.0.1:7860 \
+    APP_WEB_URL=http://127.0.0.1:3000 \
+    NODE_ENV=production \
+    HOME=/app
+
+# Switch to the non-root user
+USER user
 
-# Expose HF required port
-EXPOSE 7860
+# Expose port 7860 as required by Hugging Face Spaces
+EXPOSE 7860 3000
 
-WORKDIR /app
+# Setup entrypoint
+COPY --chown=user docker/entrypoint.sh /app/entrypoint.sh
+RUN chmod +x /app/entrypoint.sh
 
-ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
+WORKDIR /app
 
+CMD ["./entrypoint.sh"]