Update Dockerfile

Dockerfile

@@ -1,32 +1,43 @@
 # Base Python image with correct version
 FROM python:3.12-slim-bookworm AS base
 
-# Set shared environment variables
-ENV POETRY_VERSION=1.8.4 \
-    POETRY_NO_INTERACTION=1 \
-    POETRY_VIRTUALENVS_CREATE=true \
-    POETRY_VIRTUALENVS_IN_PROJECT=true \
-    POETRY_CACHE_DIR=/tmp/poetry_cache \
-    PYTHONDONTWRITEBYTECODE=1
-
-# Pull official images first
-FROM langgenius/dify-web:latest AS web
-FROM langgenius/dify-api:latest AS api
-
-# Final stage
-FROM base
-
-# Create users and set up directories
+WORKDIR /app/api
+
+# Install Poetry
+ENV POETRY_VERSION=1.8.4
+ENV POETRY_HOME=/opt/poetry
+ENV POETRY_CACHE_DIR=/tmp/poetry_cache
+ENV POETRY_NO_INTERACTION=1
+ENV POETRY_VIRTUALENVS_IN_PROJECT=true
+ENV POETRY_VIRTUALENVS_CREATE=true
+
+# Install poetry in a separate layer
+RUN pip install --no-cache-dir "poetry==${POETRY_VERSION}"
+
+# Create and switch to non-root user early
 RUN useradd -m -u 1000 user && \
-    apt-get update && \
+    chown -R user:user /app /opt/poetry /tmp/poetry_cache
+
+USER user
+
+# Copy dependency files
+COPY --chown=user:user pyproject.toml poetry.lock poetry.toml ./
+
+# Install dependencies
+RUN poetry install --no-root --no-dev
+
+# Switch back to root for system installations
+USER root
+
+# Install system dependencies
+RUN apt-get update && \
     apt-get install -y postgresql postgresql-contrib curl git gcc python3-dev \
     libgmp-dev libmpfr-dev libmpc-dev nodejs npm && \
     rm -rf /var/lib/apt/lists/* && \
-    mkdir -p /var/run/postgresql /var/lib/postgresql/data /app/api /app/web /data/storage && \
+    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 /data
+    chmod 700 /var/lib/postgresql/data
 
 # Initialize PostgreSQL
 USER postgres
@@ -39,31 +50,11 @@ USER user
 ENV HOME=/home/user \
     PATH=/home/user/.local/bin:$PATH
 
-# Copy application files
-WORKDIR /app
-COPY --from=web --chown=user:user /app/web /app/web/
-COPY --from=api --chown=user:user /app/api /app/api/
-
-# Set up API dependencies
-WORKDIR /app/api
-COPY --from=api --chown=user /app/api/pyproject.toml /app/api/poetry.lock /app/api/poetry.toml ./
-
-# Set up Python virtual environment
-ENV VIRTUAL_ENV=/app/api/.venv
-COPY --from=api ${VIRTUAL_ENV} ${VIRTUAL_ENV}
-ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
-
-RUN pip install --no-cache-dir "poetry==${POETRY_VERSION}" && \
-    poetry install --no-root --no-dev
-
-# Create storage symlink
-RUN ln -s /data/storage /app/api/storage
-
-# Copy and set up entrypoint script
-COPY --from=api --chown=user:user /entrypoint.sh /app/entrypoint.sh
+# Copy entrypoint script
+COPY --chown=user:user docker/entrypoint.sh /app/entrypoint.sh
 RUN chmod +x /app/entrypoint.sh
 
-# Add all environment variables from the compose file
+# Set environment variables
 ENV FLASK_APP=app.py \
     EDITION=SELF_HOSTED \
     DEPLOY_ENV=PRODUCTION \
@@ -73,13 +64,9 @@ ENV FLASK_APP=app.py \
     DB_HOST=localhost \
     DB_PORT=5432 \
     DB_DATABASE=dify \
-    REDIS_HOST=localhost \
-    REDIS_PORT=6379 \
-    REDIS_PASSWORD=difyai123456 \
-    VECTOR_STORE=weaviate \
     MIGRATION_ENABLED=true
 
-EXPOSE 7860 3000
+EXPOSE 7860
 
 WORKDIR /app