Update Dockerfile

Dockerfile

@@ -1,84 +1,73 @@
-# 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_CREATE=false \
-    POETRY_CACHE_DIR=/cache/poetry
+# 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 base AS web-builder
-
+FROM node:20.11-alpine3.19 AS web-builder
 WORKDIR /app/web
 
-# Copy package files first
-COPY web/package.json web/yarn.lock ./
+# Copy repository web files
+COPY --from=repo /app/web ./
 
-# Install build dependencies globally first
-RUN npm install -g code-inspector-plugin autoprefixer postcss tailwindcss
+# Configure build environment
+ENV NODE_OPTIONS="--max_old_space_size=2048" \
+    NEXT_TELEMETRY_DISABLED=1 \
+    NODE_ENV=production
 
-# Install project dependencies
+# Install dependencies and build
 RUN yarn install --frozen-lockfile --network-timeout 300000 && \
-    yarn add --dev @types/node @types/react code-inspector-plugin autoprefixer postcss tailwindcss
-
-# Copy source files
-COPY web/ .
-
-# Build the application with standalone output
-RUN NODE_PATH=/usr/local/lib/node_modules yarn build
+    yarn add --dev @types/node @types/react && \
+    yarn build
 
 # Python builder stage
 FROM python:3.10-slim-bookworm AS python-builder
 
-# Install build dependencies in a single layer
+# Install build dependencies
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     build-essential \
+    git \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app/api
 
-# Install and configure poetry
-RUN pip install --no-cache-dir poetry
+# Copy repository API files
+COPY --from=repo /app/api ./
 
-# Copy Python files and install dependencies
-COPY api/pyproject.toml api/poetry.lock ./
-RUN poetry config virtualenvs.create false && \
+# Install poetry and dependencies
+RUN pip install --no-cache-dir poetry && \
+    poetry config virtualenvs.create false && \
     poetry install --no-dev --no-interaction --no-ansi
 
 # Final stage
 FROM python:3.10-slim-bookworm
 
-# Set up a new user named "user" with user ID 1000 (required by Hugging Face)
+# Set up user (required by Hugging Face)
 RUN useradd -m -u 1000 user
 
-# Install runtime dependencies in a single layer
+# Install runtime dependencies
 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
 WORKDIR /app
-RUN mkdir -p api web && chown -R user:user /app
+RUN mkdir -p api web storage/files && chown -R user:user /app
 
-# Copy Python environment and set permissions
+# Copy built artifacts
 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 web build artifacts with correct permissions
+COPY --from=repo --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/node_modules /app/web/node_modules
 COPY --from=web-builder --chown=user /app/web/package.json /app/web/package.json
 
-# Install gunicorn
-RUN pip install --no-cache-dir gunicorn gevent
+# Install additional Python packages
+RUN pip install --no-cache-dir gunicorn gevent psycopg2-binary redis
 
 # Set environment variables
 ENV FLASK_APP=app.py \
@@ -91,14 +80,14 @@ ENV FLASK_APP=app.py \
     NODE_ENV=production \
     HOME=/app
 
-# Switch to the non-root user
+# Switch to non-root user
 USER user
 
-# Expose port 7860 as required by Hugging Face Spaces
-EXPOSE 7860 3000
+# Expose Hugging Face required port
+EXPOSE 7860
 
-# Setup entrypoint
-COPY --chown=user docker/entrypoint.sh /app/entrypoint.sh
+# Copy and setup entrypoint
+COPY --from=repo --chown=user /app/docker/entrypoint.sh /app/entrypoint.sh
 RUN chmod +x /app/entrypoint.sh
 
 WORKDIR /app