Update Dockerfile

Dockerfile

@@ -1,31 +1,56 @@
 # syntax=docker/dockerfile:1.7
 
+# 从官方镜像中提取 sub2api 二进制
 FROM weishaw/sub2api:latest AS sub2api_bin
 
 FROM debian:bookworm-slim
 
-ENV DEBIAN_FRONTEND=noninteractive     LANG=C.UTF-8     LC_ALL=C.UTF-8     PYTHONDONTWRITEBYTECODE=1     PYTHONUNBUFFERED=1
-
-RUN apt-get update && apt-get install -y --no-install-recommends     bash     ca-certificates     curl     procps     supervisor     redis-server     postgresql     postgresql-client     python3     python3-pip     python3-venv     gosu     tini     && rm -rf /var/lib/apt/lists/*
-
+ENV DEBIAN_FRONTEND=noninteractive \
+    LANG=C.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    bash \
+    ca-certificates \
+    curl \
+    procps \
+    supervisor \
+    redis-server \
+    postgresql \
+    postgresql-client \
+    python3 \
+    python3-pip \
+    python3-venv \
+    tini \
+    && rm -rf /var/lib/apt/lists/*
+
+# HF Docker 空间 运行时用户建议用 uid 1000
 RUN useradd -m -u 1000 user
 
-ENV HOME=/home/user     APP_HOME=/home/user/app     PGDATA=/home/user/pgdata     REDIS_DIR=/home/user/redis     SUB2API_DATA_DIR=/home/user/app/data     VENV_PATH=/home/user/venv     PATH=/home/user/venv/bin:/home/user/.local/bin:$PATH
+ENV HOME=/home/user \
+    APP_HOME=/app \
+    PGDATA=/app/pgdata \
+    REDIS_DIR=/app/redis \
+    SUB2API_DATA_DIR=/app/data \
+    VENV_PATH=/app/venv \
+    PATH=/app/venv/bin:/home/user/.local/bin:$PATH
 
-WORKDIR ${APP_HOME}
+WORKDIR /app
 
 COPY --from=sub2api_bin /app/sub2api /usr/local/bin/sub2api
 
-COPY --chown=user:user supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY --chown=user:user start.sh /usr/local/bin/start.sh
-COPY --chown=user:user backup_worker.sh /usr/local/bin/backup_worker.sh
-COPY --chown=user:user backup_to_dataset.py ${APP_HOME}/backup_to_dataset.py
-COPY --chown=user:user requirements.txt ${APP_HOME}/requirements.txt
-COPY --chown=user:user README.md ${APP_HOME}/README.space.md
+COPY --chown=user:user supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
-RUN chmod +x /usr/local/bin/start.sh /usr/local/bin/backup_worker.sh     && mkdir -p ${APP_HOME} ${SUB2API_DATA_DIR} ${PGDATA} ${REDIS_DIR} /var/log/supervisor ${VENV_PATH}     && chown -R user:user ${HOME} ${APP_HOME} ${PGDATA} ${REDIS_DIR} ${SUB2API_DATA_DIR} /var/log/supervisor ${VENV_PATH}     && python3 -m venv ${VENV_PATH}     && ${VENV_PATH}/bin/pip install --no-cache-dir --upgrade pip setuptools wheel     && ${VENV_PATH}/bin/pip install --no-cache-dir -r ${APP_HOME}/requirements.txt
+RUN chmod +x /usr/local/bin/start.sh \
+    && mkdir -p /app /app/data /app/data/logs /app/data/sora /app/pgdata /app/redis /app/venv /var/log/supervisor \
+    && chown -R user:user /app /var/log/supervisor \
+    && python3 -m venv /app/venv \
+    && /app/venv/bin/pip install --no-cache-dir --upgrade pip setuptools wheel
 
 EXPOSE 8080
 
 USER user
-ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/start.sh"]
+ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/start.sh"]