Update Dockerfile

Dockerfile

@@ -1,51 +1,38 @@
-# Base stage for git operations
-FROM alpine/git AS repo
-WORKDIR /app
-RUN git clone https://github.com/langgenius/dify.git .
-
-# Web builder stage
-FROM node:20.11-alpine3.19 AS web-builder
-WORKDIR /app
 
-# Copy repository web files
-COPY --from=repo /app/web ./web/
-WORKDIR /app/web
+# Base stage with shared configuration
+FROM node:20.11-alpine3.19 AS base
 
-# Configure build environment
+# Configure shared environment variables
 ENV NODE_OPTIONS="--max_old_space_size=2048" \
     NEXT_TELEMETRY_DISABLED=1 \
-    NODE_ENV=production
+    NODE_ENV=production \
+    PYTHONDONTWRITEBYTECODE=1 \
+    POETRY_NO_INTERACTION=1 \
+    POETRY_VIRTUALENVS_CREATE=false \
+    POETRY_CACHE_DIR=/cache/poetry
 
-# Install dependencies and build
-RUN yarn install --frozen-lockfile --network-timeout 300000 && \
-    yarn add --dev @types/node @types/react && \
-    yarn build
+# Web builder stage
+FROM langgenius/dify-web:latest AS web-builder
 
-# Python builder stage
-FROM python:3.10-slim-bookworm AS python-builder
+WORKDIR /app/web
 
-# Install build dependencies
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    build-essential \
-    git \
-    && rm -rf /var/lib/apt/lists/*
+# Copy web artifacts
+COPY --from=langgenius/dify-web:latest /app/web/.next /app/web/.next
+COPY --from=langgenius/dify-web:latest /app/web/public /app/web/public
+COPY --from=langgenius/dify-web:latest /app/web/package.json /app/web/package.json
 
-WORKDIR /app
+# API builder stage 
+FROM langgenius/dify-api:latest AS api-builder
 
-# Copy repository API files
-COPY --from=repo /app/api ./api/
 WORKDIR /app/api
 
-# Install poetry and dependencies
-RUN pip install --no-cache-dir poetry && \
-    poetry config virtualenvs.create false && \
-    poetry install --no-dev --no-interaction --no-ansi
+# Copy API artifacts
+COPY --from=langgenius/dify-api:latest /app/api /app/api/
 
 # Final stage
 FROM python:3.10-slim-bookworm
 
-# Set up user (required by Hugging Face)
+# Create non-root user (required by Hugging Face)
 RUN useradd -m -u 1000 user
 
 # Install runtime dependencies
@@ -53,37 +40,20 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     nodejs \
     npm \
-    postgresql-client \
-    redis-tools \
     && rm -rf /var/lib/apt/lists/*
 
-# Create app directory structure
+# Set up directory structure
 WORKDIR /app
-RUN mkdir -p api web storage/files && chown -R user:user /app
-
-# Copy built artifacts
-COPY --from=python-builder --chown=user /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
-COPY --from=python-builder --chown=user /app/api /app/api/
-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/package.json /app/web/package.json
-
-# Copy entrypoint scripts from repo
-COPY --from=repo --chown=user /app/api/docker/entrypoint.sh /app/api/entrypoint.sh
-COPY --from=repo --chown=user /app/web/docker/entrypoint.sh /app/web/entrypoint.sh
-RUN chmod +x /app/api/entrypoint.sh /app/web/entrypoint.sh
-
-# Create startup script
-RUN echo '#!/bin/bash\n\
-/app/api/entrypoint.sh & \n\
-/app/web/entrypoint.sh & \n\
-wait' > /app/start.sh && \
-chmod +x /app/start.sh
-
-# Install additional Python packages
-RUN pip install --no-cache-dir gunicorn gevent psycopg2-binary redis
-
-# Set environment variables
+RUN mkdir -p api web && chown -R user:user /app
+
+# Copy artifacts from builders
+COPY --from=api-builder --chown=user /app/api /app/api/
+COPY --from=web-builder --chown=user /app/web /app/web
+
+# Install Python requirements
+RUN pip install --no-cache-dir gunicorn gevent
+
+# Set environment variables for Hugging Face Spaces
 ENV FLASK_APP=app.py \
     EDITION=SELF_HOSTED \
     DEPLOY_ENV=PRODUCTION \
@@ -97,9 +67,13 @@ ENV FLASK_APP=app.py \
 # Switch to non-root user
 USER user
 
-# Expose Hugging Face required port
+# Expose Hugging Face Spaces required port
 EXPOSE 7860 3000
 
+# Setup entrypoint
+COPY --chown=user docker/entrypoint.sh /app/entrypoint.sh
+RUN chmod +x /app/entrypoint.sh
+
 WORKDIR /app
 
-CMD ["./start.sh"]
+CMD ["./entrypoint.sh"]