Update Dockerfile

Dockerfile

@@ -2,34 +2,25 @@
 FROM node:20-slim AS builder
 
 # 设置构建时变量
-ARG REQUIREMENTS="requests yt-dlp"
+ARG requirements="requests yt-dlp"
 ARG PACKAGES="n8n"
 ARG WORKDIR=/app
-ARG RCLONE_VERSION=latest
+ARG DUMP_URL
+ARG DUMP_PASSWORD
 
 # 安装 Python3、venv 以及必要的系统工具
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    python3 \
-    python3-venv \
-    curl \
-    gnupg \
-    build-essential \
-    unzip \
-    && npm install -g ${PACKAGES} \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y python3 python3-venv curl gnupg build-essential && \
+    npm install -g ${PACKAGES} && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # 设置 Python 虚拟环境
 ENV VIRTUAL_ENV=/opt/venv
-RUN python3 -m venv $VIRTUAL_ENV \
-    && $VIRTUAL_ENV/bin/pip install --no-cache-dir --upgrade pip \
-    && $VIRTUAL_ENV/bin/pip install --no-cache-dir $REQUIREMENTS
+RUN python3 -m venv $VIRTUAL_ENV && \
+    $VIRTUAL_ENV/bin/pip install --upgrade pip && \
+    $VIRTUAL_ENV/bin/pip install $requirements
 
-# 下载并安装 rclone
-RUN curl https://rclone.org/install.sh | bash
-
-# 主运行阶段：基于 PostgreSQL 镜像
-FROM postgres:15
+# 主运行阶段：基于较小的 PostgreSQL 镜像
+FROM postgres:latest
 
 # 设置构建时变量
 ARG POSTGRES_USER=n8n
@@ -39,10 +30,9 @@ ARG WEBHOOK_URL=https://aigenai-db.hf.space/
 ARG WORKDIR=/app
 ARG DB_IMPORT=no
 ARG NODEJS_VER=20
-ARG PACKAGES=n8n
+ARG PACKAGES="n8n"
 
 # 设置环境变量
-ENV DB_IMPORT=no
 ENV POSTGRES_USER=${POSTGRES_USER} \
     POSTGRES_PASSWORD=${POSTGRES_PASSWORD} \
     POSTGRES_DB=${POSTGRES_DB} \
@@ -65,36 +55,22 @@ ENV POSTGRES_USER=${POSTGRES_USER} \
     VIRTUAL_ENV=/opt/venv \
     PATH="$VIRTUAL_ENV/bin:/usr/local/lib/node_modules/n8n/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
 
-# 复制构建阶段的 Node.js、n8n、Python 运行环境和 rclone
+# 复制构建阶段的 Node.js 和 n8n
 COPY --from=builder /usr/local/bin/node /usr/local/bin/
 COPY --from=builder /usr/local/lib/node_modules /usr/local/lib/node_modules
+# 复制构建阶段的 Python 运行环境
 COPY --from=builder $VIRTUAL_ENV $VIRTUAL_ENV
-COPY --from=builder /usr/bin/rclone /usr/bin/rclone
 
 # 安装必要的软件包并设置时区
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    curl \
-    unzip \
-    gnupg \
-    build-essential \
-    sudo \
-    vim \
-    git \
-    procps \
-    lsof \
-    net-tools \
-    ca-certificates \
-    openssl \
-    tzdata \
-    python3 \
-    htop \
-    jq \
-    wget \
-    gosu \
-    && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && echo "Asia/Shanghai" > /etc/timezone \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y \
+    curl unzip gnupg build-essential sudo vim git procps lsof net-tools \
+    ca-certificates openssl tzdata python3-venv gosu \
+    htop jq wget && \
+    ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+    dpkg-reconfigure --frontend noninteractive tzdata
+
+# 安装 rclone
+RUN curl https://rclone.org/install.sh | bash
 
 # 设置工作目录并复制启动脚本
 WORKDIR ${WORKDIR}
@@ -102,28 +78,18 @@ COPY run.sh ${WORKDIR}/run.sh
 COPY import-db.sh /docker-entrypoint-initdb.d/
 RUN chmod +x ${WORKDIR}/run.sh /docker-entrypoint-initdb.d/import-db.sh
 
-# 设置 POSTGRES_USER 的 UID 为 1000
-RUN usermod -u 1000 ${POSTGRES_USER} \
-    && groupmod -g 1000 ${POSTGRES_USER} \
-    && chown -R ${POSTGRES_USER}:${POSTGRES_USER} /var/lib/postgresql \
-    && chown -R ${POSTGRES_USER}:${POSTGRES_USER} /var/run/postgresql \
-    && chown -R ${POSTGRES_USER}:${POSTGRES_USER} ${WORKDIR} \
-    && mkdir -p ${WORKDIR}/backups \
-    && chown -R ${POSTGRES_USER}:${POSTGRES_USER} ${WORKDIR}/backups \
-    && chmod -R 775 ${WORKDIR}/backups
+# 更改现有的 postgres 用户 UID 和 GID 为 1000
+USER root
+RUN usermod -u 1000 postgres && groupmod -g 1000 postgres && \
+    chown -R postgres:postgres /var/lib/postgresql && chown -R postgres:postgres /var/run/postgresql && \
+    chown -R postgres:postgres $WORKDIR && mkdir -p $WORKDIR/backups && chmod -R 775 $WORKDIR/backups
+    
+# 切换到 postgres 用户
+USER postgres
 
-# 设置 POSTGRES_USER 的 shell 为 bash
-RUN chsh -s /bin/bash ${POSTGRES_USER}
-
-# 健康检查配置
+# 健康检查配置（可选）
 HEALTHCHECK --interval=120s --timeout=10s --start-period=10s --retries=3 \
     CMD curl -f http://localhost:7860/HEALTHZ || exit 1
 
-# 暴露 n8n 端口
-EXPOSE 7860
-
-# 切换到 POSTGRES_USER
-USER ${POSTGRES_USER}
-
 # 启动容器时执行 run.sh 脚本
 CMD ["./run.sh"]