Update Dockerfile

Dockerfile

@@ -1,120 +1,285 @@
-# 使用 Python 和 Node.js 作为基础镜像
-FROM nikolaik/python-nodejs:python3.12-nodejs20
+#!/bin/bash
+set -eo pipefail
 
-# 添加维护者信息
-LABEL maintainer="ai来事 <https://www.youtube.com/@all.ai.>"
+# --- 关键修复：直接读取平台注入的环境变量 ---
+export DB_POSTGRESDB_HOST="${POSTGRESDB_HOST}"
+export DB_POSTGRESDB_PORT="${POSTGRESDB_PORT:-5432}" # 如果平台未提供端口，则使用默认值
+export DB_POSTGRESDB_USER="${POSTGRES_USER}"
+export DB_POSTGRESDB_PASSWORD="${POSTGRES_PASSWORD}"
+export DB_POSTGRESDB_DATABASE="${POSTGRES_DB}"
 
-ARG CACHEBUST=99
+# 错误处理函数
+handle_error() {
+    echo "错误发生在第 $1 行"
+    exit 1
+}
+trap 'handle_error $LINENO' ERR
 
-# 设置构建参数，提供默认值
-ARG WEBHOOK_URL=https://你的hf账户名-空间名.hf.space/
-ARG POSTGRESDB_PORT=5432
+# 超时处理函数
+timeout_handler() {
+    echo "操作超时"
+    exit 1
+}
 
-# 设置基本环境变量
-ENV WEBHOOK_URL=${WEBHOOK_URL} \
-    N8N_HOST=0.0.0.0 \
-    N8N_PORT=7860 \
-    N8N_PROTOCOL=https \
-    GENERIC_TIMEZONE=Asia/Shanghai \
-    N8N_METRICS=true \
-    QUEUE_HEALTH_CHECK_ACTIVE=true \
-    N8N_PAYLOAD_SIZE_MAX=256 \
-    DB_TYPE=postgresdb \
-    DB_POSTGRESDB_PORT=${POSTGRESDB_PORT} \
-    VIRTUAL_ENV=/home/pn/venv \
-    PATH="/home/pn/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH" \
-    # 添加 Qdrant 配置
-    QDRANT_HOST=http://localhost \
-    QDRANT_PORT=6333 \
-    QDRANT_VERSION=1.12.4 \
-    # 添加超时配置
-    WAIT_TIMEOUT=30 \
-    # 添加日志级别
-    N8N_LOG_LEVEL=info
+# 等待服务就绪的通用函数
+wait_for_service() {
+    local service=$1
+    local host=$2
+    local port=$3
+    local timeout=${4:-$WAIT_TIMEOUT}
+    
+    echo "等待 $service 就绪..."
+    local end=$((SECONDS + timeout))
+    
+    while [ $SECONDS -lt $end ]; do
+        if nc -z "$host" "$port" >/dev/null 2>&1; then
+            echo "$service 已就绪"
+            return 0
+        fi
+        echo "尝试连接 $service at $host:$port..."
+        sleep 1
+    done
+    
+    echo "$service 启动超时"
+    exit 1
+}
 
-# 第1步：安装所有系统层面的依赖包
-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 \
-    htop \
-    jq \
-    netcat-openbsd \
-    redis-server \
-    bash \
-    # 清理apt缓存，减小镜像体积
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+# 启动 Redis 服务
+start_redis() {
+    echo "Starting Redis server..."
+    redis-server --daemonize yes
+    sleep 1
+    if ! redis-cli ping > /dev/null 2>&1; then
+        echo "Failed to start Redis server"
+        exit 1
+    fi
+    
+    # 设置 Redis 配置
+    redis-cli config set maxmemory 512mb
+    redis-cli config set maxmemory-policy allkeys-lru
+    echo ""
+    echo "Redis server started successfully"
+    echo ""
+}
 
-# 第2步：安装 Node.js
-RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
-    && apt-get install -y --no-install-recommends nodejs
+# 启动 Qdrant 服务
+start_qdrant() {
+    echo "Starting Qdrant server..."
+    
+    # 确保目录存在并有正确的权限
+    mkdir -p /home/pn/.n8n/qdrant/storage
+    mkdir -p /home/pn/.n8n/qdrant/config
+    mkdir -p /home/pn/.n8n/qdrant/snapshots
+    mkdir -p /home/pn/.n8n/qdrant/logs
+    
+    # 设置正确的权限
+    chmod -R 755 /home/pn/.n8n/qdrant
+    chown -R pn:pn /home/pn/.n8n/qdrant
+    
+    # 创建 Qdrant 配置文件
+    cat > /home/pn/.n8n/qdrant/config/config.yaml <<EOF
+service:
+  host: 0.0.0.0
+  http_port: 6333
+  grpc_port: 6334
+  enable_cors: true
+  enable_tls: false
+  max_request_size_mb: 64
+  max_workers: 0
 
-# 第3步：配置时区
-RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
-    && dpkg-reconfigure --frontend noninteractive tzdata
+storage:
+  storage_path: /home/pn/.n8n/qdrant/storage
+  snapshots_path: /home/pn/.n8n/qdrant/snapshots
+  on_disk_payload: true
+  
+  performance:
+    max_search_threads: 0
+    max_optimization_threads: 0
+    
+  optimizers:
+    deleted_threshold: 0.2
+    vacuum_min_vector_number: 1000
+    default_segment_number: 0
+    max_segment_size_kb: null
+    indexing_threshold_kb: 20000
+    flush_interval_sec: 5
+    
+  hnsw_index:
+    m: 16
+    ef_construct: 100
+    full_scan_threshold_kb: 10000
+    max_indexing_threads: 0
+    on_disk: false
 
-# 第4步：下载并安装 Qdrant
-RUN cd /tmp \
-    && curl -L "https://github.com/qdrant/qdrant/releases/download/v${QDRANT_VERSION}/qdrant-x86_64-unknown-linux-gnu.tar.gz" -o qdrant.tar.gz \
-    && tar xvf qdrant.tar.gz \
-    && mv qdrant /usr/local/bin/ \
-    && rm qdrant.tar.gz
+logger:
+  on_disk:
+    enabled: true
+    log_file: /home/pn/.n8n/qdrant/logs/qdrant.log
+    log_level: INFO
 
-# 第5步：创建并设置 Qdrant 数据目录的权���
-RUN mkdir -p /home/pn/.n8n/qdrant/storage \
-    && mkdir -p /home/pn/.n8n/qdrant/config \
-    && mkdir -p /home/pn/.n8n/qdrant/snapshots \
-    && chown -R pn:pn /home/pn/.n8n/qdrant \
-    && chmod -R 755 /home/pn/.n8n/qdrant
+telemetry_disabled: true
+EOF
 
-# 第6步：创建 Python 虚拟环境并安装依赖
-RUN python3 -m venv $VIRTUAL_ENV \
-    && $VIRTUAL_ENV/bin/pip install --no-cache-dir --upgrade pip requests yt-dlp
+    # 确保配置文件有正确的权限
+    chmod 644 /home/pn/.n8n/qdrant/config/config.yaml
+    
+    # 使用配置文件启动 Qdrant
+    qdrant --config-path /home/pn/.n8n/qdrant/config/config.yaml > /home/pn/.n8n/qdrant/logs/startup.log 2>&1 &
+    
+    # 等待 Qdrant 启动
+    local timeout=30
+    local end=$((SECONDS + timeout))
+    
+    while [ $SECONDS -lt $end ]; do
+        if curl -s http://localhost:6333/health >/dev/null; then
+            echo "Qdrant server started successfully"
+            
+            # 预创建常用集合
+            echo "Creating default collections..."
+            
+            # 创建文本向量集合 (768维，适用于多数文本嵌入模型)
+            curl -X PUT 'http://localhost:6333/collections/text_vectors' \
+                -H 'Content-Type: application/json' \
+                -d '{
+                    "vectors": {
+                        "size": 768,
+                        "distance": "Cosine",
+                        "on_disk": true
+                    },
+                    "optimizers_config": {
+                        "default_segment_number": 2,
+                        "indexing_threshold": 20000,
+                        "memmap_threshold": 10000
+                    },
+                    "hnsw_config": {
+                        "m": 16,
+                        "ef_construct": 100,
+                        "full_scan_threshold": 10000,
+                        "max_indexing_threads": 0,
+                        "on_disk": true
+                    },
+                    "init_from": {
+                        "collection_name": "text_vectors"
+                    }
+                }'
+            
+            # 创建图像向量集合 (512维，适用于多数图像嵌入模型)
+            curl -X PUT 'http://localhost:6333/collections/image_vectors' \
+                -H 'Content-Type: application/json' \
+                -d '{
+                    "vectors": {
+                        "size": 512,
+                        "distance": "Cosine"
+                    },
+                    "optimizers_config": {
+                        "default_segment_number": 2,
+                        "indexing_threshold": 20000
+                    },
+                    "hnsw_config": {
+                        "m": 16,
+                        "ef_construct": 100,
+                        "full_scan_threshold": 10000
+                    }
+                }'
+            
+            # 创建通用向量集合 (1536维，适用于 OpenAI 的嵌入模型)
+            curl -X PUT 'http://localhost:6333/collections/openai_vectors' \
+                -H 'Content-Type: application/json' \
+                -d '{
+                    "vectors": {
+                        "size": 1536,
+                        "distance": "Cosine"
+                    },
+                    "optimizers_config": {
+                        "default_segment_number": 2,
+                        "indexing_threshold": 20000
+                    },
+                    "hnsw_config": {
+                        "m": 16,
+                        "ef_construct": 100,
+                        "full_scan_threshold": 10000
+                    }
+                }'
+                
+            # 验证集合创建状态并输出详细信息
+            echo -e "\nVerifying collections:"
+            curl -s 'http://localhost:6333/collections' | jq '.'
+            
+            # 测试连接
+            echo -e "\nTesting Qdrant connection:"
+            curl -v http://localhost:6333/health
+            
+            return 0
+        fi
+        echo "Waiting for Qdrant to start..."
+        sleep 1
+        
+        # 检查是否有错误日志
+        if grep -i "error" /home/pn/.n8n/qdrant/logs/startup.log >/dev/null 2>&1; then
+            echo "Error found in Qdrant logs:"
+            tail -n 10 /home/pn/.n8n/qdrant/logs/startup.log
+        fi
+    done
+    
+    echo "Failed to start Qdrant server"
+    echo "Last 10 lines of Qdrant log:"
+    tail -n 10 /home/pn/.n8n/qdrant/logs/startup.log
+    exit 1
+}
 
-# --- 优化点: 将 n8n 主程序和社区节点分开安装 ---
+# 检查服务状态
+check_services() {
+    echo "检查服务状态..."
+    
+    # 检查 Redis
+    echo "Redis 状态："
+    redis-cli info | grep 'used_memory\|connected_clients\|total_connections_received'
+        
+    # 检查 Qdrant
+    echo "Qdrant 状态："
+    if curl -s http://localhost:6333/metrics >/dev/null; then
+        echo "Qdrant 运行正常"
+        curl -s http://localhost:6333/metrics
+        
+        # 显示���合信息
+        echo "Qdrant 集合列表："
+        curl -s http://localhost:6333/collections
+    else
+        echo "Qdrant 服务异常"
+        tail -n 10 /home/pn/.n8n/qdrant/qdrant.log
+    fi
+}
 
-# 第7步：全局安装 n8n 主程序和 pnpm
-RUN npm install -g n8n@latest pnpm
+# 主流程
+main() {
+    current_time=$(date +"%Y-%m-%d %H:%M:%S")
+    echo "Starting services at $current_time"
+    
+    # 输出配置信息
+    echo "Database Configuration:"
+    echo "Host: ${DB_POSTGRESDB_HOST}"
+    echo "Port: ${DB_POSTGRESDB_PORT}"
+    echo "User: ${DB_POSTGRESDB_USER}"
+    echo "Database: ${DB_POSTGRESDB_DATABASE}"
+    echo "Type: ${DB_TYPE}"
+    
+    # 启动服务
+    wait_for_service "PostgreSQL" "${DB_POSTGRESDB_HOST}" "${DB_POSTGRESDB_PORT}"
+    echo ""
+    start_redis
+    echo ""
+    start_qdrant
+    echo ""
+    check_services
+    
+    # 设置 N8N 环境变量
+    source /home/pn/n8n/config/n8n_env.sh
+    
+    echo ""
+    echo "Starting n8n..."
+    # --- 最终修复：使用新的 n8n 启动命令 ---
+    exec n8n
+}
 
-# 第8步：在指定的自定义目录中安装社区节点 (使用 pnpm 安装)
-ARG N8N_CUSTOM_EXTENSIONS_DIR=/home/pn/.n8n/custom-nodes
-RUN mkdir -p ${N8N_CUSTOM_EXTENSIONS_DIR} \
-    && pnpm add --dir ${N8N_CUSTOM_EXTENSIONS_DIR} n8n-nodes-link-preview n8n-nodes-scrapegraphai \
-    && chown -R pn:pn ${N8N_CUSTOM_EXTENSIONS_DIR}
-
-# 第9步 (最终修复)：创建名为 "config" 的 n8n 配置文件
-RUN echo '{"nodes.allowUnsupported": true, "nodes.custom.path": "/home/pn/.n8n/custom-nodes"}' > /home/pn/.n8n/config \
-    && chown pn:pn /home/pn/.n8n/config
-
-# 创建工作目录
-WORKDIR /home/pn/n8n
-
-# 复制启动脚本并创建数据目录
-COPY --chown=pn:pn run.sh ./run.sh
-COPY --chown=pn:pn config/n8n_env.sh ./config/n8n_env.sh
-RUN chmod +x ./run.sh \
-    && mkdir -p /home/pn/.n8n \
-    && chown -R pn:pn /home/pn/.n8n \
-    && chown -R pn:pn /home/pn/n8n
-
-# 暴露端口
-EXPOSE 7860
-
-# 切换到非 root 用户
-USER pn
-
-# 设置数据卷
-VOLUME ["/home/pn/.n8n"]
-
-# 启动命令
-CMD ["./run.sh"]
+# 执行主流程
+main "$@"