Refactor Dockerfile; update docker-compose command formatting

Author: huyuwei1996

backend/Dockerfile

@@ -1,46 +1,64 @@
+ARG SERVICE_TYPE=fastapi_server
+
+# ===== Build Stage =====
 FROM python:3.10-slim AS builder
 COPY --from=ghcr.io/astral-sh/uv:0.6.2 /uv /uvx /bin/
 
-RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources && \
-    apt-get update \
-    && apt-get install -y --no-install-recommends gcc python3-dev\
+# Install dependencies for building Python packages
+RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends gcc python3-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV UV_COMPILE_BYTECODE=1
-ENV UV_NO_CACHE=1
-ENV UV_LINK_MODE=copy
-ENV UV_PROJECT_ENVIRONMENT=/usr/local
+# Configure uv environment
+ENV UV_COMPILE_BYTECODE=1 \
+    UV_NO_CACHE=1 \
+    UV_LINK_MODE=copy \
+    UV_PROJECT_ENVIRONMENT=/usr/local
+
+# COPY backend/plugin/casbin/requirements.txt plugin_casbin_requirements.txt
 
-# Install dependencies
+# Install dependencies using uv (with cache optimization)
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=backend/uv.lock,target=uv.lock \
     --mount=type=bind,source=backend/pyproject.toml,target=pyproject.toml \
-    uv sync --frozen --no-install-project --no-default-groups --group server
+    uv sync --frozen --no-install-project --no-default-groups --group server \
+    # && uv pip install --system -r plugin_casbin_requirements.txt
 
 
-FROM python:3.10-slim
-
+# ===== Runtime Base Image =====
+FROM python:3.10-slim AS runtime
 SHELL ["/bin/bash", "-c"]
-
 ENV TZ="Asia/Shanghai"
 
-WORKDIR /fba
-
-RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources && \
-    apt-get update \
+# Install runtime dependencies
+RUN sed -i 's/deb.debian.org/mirrors.ustc.edu.cn/g' /etc/apt/sources.list.d/debian.sources \
+    && apt-get update \
     && apt-get install -y --no-install-recommends supervisor procps iproute2 \
-    && rm -rf /var/lib/apt/lists/* \
-    && mkdir -p /var/log/fastapi_server \
-    && mkdir -p /var/log/celery
+    && rm -rf /var/lib/apt/lists/*
 
-COPY . .
-RUN chmod +x backend/*.sh
+# Copy application and Python packages
+COPY . /fba
 COPY --from=builder /usr/local /usr/local
-COPY deploy/backend/supervisord.conf /etc/supervisor/supervisord.conf
-ARG SERVICE_TYPE=fastapi_server
-COPY deploy/backend/${SERVICE_TYPE}.conf /etc/supervisor/conf.d/
 
+# ===== FastAPI Server Image =====
+FROM runtime AS fastapi_server
+WORKDIR /fba/backend
+RUN mkdir -p /var/log/fastapi_server
+COPY deploy/backend/supervisord.conf /etc/supervisor/supervisord.conf
+COPY deploy/backend/fastapi_server.conf /etc/supervisor/conf.d/
 EXPOSE 8001
+ENV PYTHONPATH=/fba
+CMD ["uvicorn", "backend.main:app", "--host", "0.0.0.0", "--port","8000"]
+
+# ===== Celery Worker Image =====
+FROM runtime AS celery
+WORKDIR /fba/backend
+RUN mkdir -p /var/log/celery && chmod +x /fba/backend/*.sh
+COPY deploy/backend/supervisord.conf /etc/supervisor/supervisord.conf
+COPY deploy/backend/celery.conf /etc/supervisor/conf.d/
 EXPOSE 8555
+CMD ["./celery-start.sh"]
 
-CMD ["backend/${SERVICE_TYPE}-start.sh"]
+# Select the image type based on SERVICE_TYPE build arg
+FROM ${SERVICE_TYPE}

backend/fastapi_server-start.sh

@@ -36,7 +36,8 @@ services:
       - fba_mysql:/var/lib/mysql
     networks:
       - fba_network
-    command: --default-authentication-plugin=mysql_native_password
+    command: |
+      --default-authentication-plugin=mysql_native_password
       --character-set-server=utf8mb4
       --collation-server=utf8mb4_general_ci
       --lower_case_table_names=1