update

.gitattributes

@@ -1,35 +0,0 @@
-*.7z filter=lfs diff=lfs merge=lfs -text
-*.arrow filter=lfs diff=lfs merge=lfs -text
-*.bin filter=lfs diff=lfs merge=lfs -text
-*.bz2 filter=lfs diff=lfs merge=lfs -text
-*.ckpt filter=lfs diff=lfs merge=lfs -text
-*.ftz filter=lfs diff=lfs merge=lfs -text
-*.gz filter=lfs diff=lfs merge=lfs -text
-*.h5 filter=lfs diff=lfs merge=lfs -text
-*.joblib filter=lfs diff=lfs merge=lfs -text
-*.lfs.* filter=lfs diff=lfs merge=lfs -text
-*.mlmodel filter=lfs diff=lfs merge=lfs -text
-*.model filter=lfs diff=lfs merge=lfs -text
-*.msgpack filter=lfs diff=lfs merge=lfs -text
-*.npy filter=lfs diff=lfs merge=lfs -text
-*.npz filter=lfs diff=lfs merge=lfs -text
-*.onnx filter=lfs diff=lfs merge=lfs -text
-*.ot filter=lfs diff=lfs merge=lfs -text
-*.parquet filter=lfs diff=lfs merge=lfs -text
-*.pb filter=lfs diff=lfs merge=lfs -text
-*.pickle filter=lfs diff=lfs merge=lfs -text
-*.pkl filter=lfs diff=lfs merge=lfs -text
-*.pt filter=lfs diff=lfs merge=lfs -text
-*.pth filter=lfs diff=lfs merge=lfs -text
-*.rar filter=lfs diff=lfs merge=lfs -text
-*.safetensors filter=lfs diff=lfs merge=lfs -text
-saved_model/**/* filter=lfs diff=lfs merge=lfs -text
-*.tar.* filter=lfs diff=lfs merge=lfs -text
-*.tar filter=lfs diff=lfs merge=lfs -text
-*.tflite filter=lfs diff=lfs merge=lfs -text
-*.tgz filter=lfs diff=lfs merge=lfs -text
-*.wasm filter=lfs diff=lfs merge=lfs -text
-*.xz filter=lfs diff=lfs merge=lfs -text
-*.zip filter=lfs diff=lfs merge=lfs -text
-*.zst filter=lfs diff=lfs merge=lfs -text
-*tfevents* filter=lfs diff=lfs merge=lfs -text

Dockerfile

@@ -9,11 +9,12 @@ ENV TRAEFIK_CONFIG_FILE=/home/pn/app/traefik/traefik.yml
 RUN wget -q https://github.com/traefik/traefik/releases/download/v${TRAEFIK_VERSION}/traefik_v${TRAEFIK_VERSION}_linux_amd64.tar.gz \
     && tar -xzf traefik_v${TRAEFIK_VERSION}_linux_amd64.tar.gz \
     && mv traefik /usr/local/bin/ \
-    && rm traefik_v${TRAEFIK_VERSION}_linux_amd64.tar.gz
-
-# 安装 jq 用于解析 JSON，http-server 和 gettext-base（包含 envsubst）
-RUN apt-get update && apt-get install -y jq gettext-base curl && \
-    npm install -g serve
+    && rm traefik_v${TRAEFIK_VERSION}_linux_amd64.tar.gz \
+    # 安装 jq 用于解析 JSON，http-server 和 gettext-base（包含 envsubst）
+    && apt-get update && apt-get install -y jq gettext-base curl \
+    && npm install -g serve \
+    # 安装 n8n
+    && npm install -g n8n
 
 # 切换到 pn 用户
 USER pn
@@ -22,7 +23,7 @@ USER pn
 WORKDIR /home/pn/app
 
 # 创建必要的目录
-RUN mkdir -p /home/pn/app/traefik /home/pn/app/python /home/pn/app/node /home/pn/app/waeb && \
+RUN mkdir -p /home/pn/app/traefik /home/pn/app/python /home/pn/app/node /home/pn/app/root /home/pn/app/n8n && \
     chown -R pn:pn /home/pn /home/pn/app
 
 # 复制配置文件和启动脚本
@@ -35,10 +36,11 @@ RUN chmod +x /home/pn/app/start.sh
 # 设置环境变量
 ENV TRAEFIK_PORT=7860 \
     PYTHON_PORT=8000 \
-    NODE_PORT=8001
+    NODE_PORT=8001 \
+    N8N_PORT=5678
 
 # 暴露 Traefik 和后端服务端口
-EXPOSE $TRAEFIK_PORT $PYTHON_PORT $NODE_PORT
+EXPOSE $TRAEFIK_PORT $PYTHON_PORT $NODE_PORT $N8N_PORT
 
 # 启动容器时运行启动脚本
 CMD ["/home/pn/app/start.sh"]

services.json

@@ -1,7 +1,7 @@
 [
     {
         "name": "python-service",
-        "command": "python -m http.server",
+        "command": "python -m http.server $PORT",
         "port": 8000,
         "path_prefix": "/python",
         "health_check_path": "/",
@@ -12,7 +12,7 @@
     },
     {
         "name": "node-service",
-        "command": "npx serve -s --listen $port --single --cors",
+        "command": "npx serve -s --listen $PORT --single --cors",
         "port": 8001,
         "path_prefix": "/node",
         "health_check_path": "/",
@@ -20,5 +20,17 @@
             "NODE_ENV": "production"
         },
         "working_dir": "/home/pn/app/node"
+    },
+    {
+        "name": "n8n-service",
+        "command": "n8n start --port $PORT",
+        "port": 5678,
+        "path_prefix": "/",
+        "health_check_path": "/healthz",
+        "env": {
+            "N8N_PORT": "5678",
+            "N8N_EDITOR_BASE_URL": "/"
+        },
+        "working_dir": "/home/pn/app/n8n"
     }
 ]

start.sh

@@ -17,8 +17,6 @@ touch /home/pn/app/python/hi.txt
 echo "Hello, Python!" > /home/pn/app/python/hi.txt
 touch /home/pn/app/node/hi.txt
 echo "Hello, Node!" > /home/pn/app/node/hi.txt
-touch /home/pn/app/hi.txt
-echo "Hello, Waeb!" > /home/pn/app/hi.txt
 
 # 启动服务
 echo "$services" | while read -r service; do
@@ -37,7 +35,7 @@ echo "$services" | while read -r service; do
         log "ERROR: Directory $working_dir does not exist"
         exit 1
     fi
-    (cd $working_dir && eval "port=$port $command") &
+    (cd $working_dir && eval "PORT=$port $command") &
 done
 
 # 等待服务启动
@@ -65,20 +63,11 @@ echo "$services" | while read -r service; do
     port=$(echo $service | jq -r '.port')
     health_check_path=$(echo $service | jq -r '.health_check_path')
     
-    # 跳过 waeb-service 的健康检查
-    if [ "$name" != "waeb-service" ]; then
-        if ! check_health $port "$name" "$health_check_path"; then
-            log "ERROR: 健康检查失败，退出程序"
-            exit 1
-        fi
-    else
-        log "跳过 waeb-service 的健康检查"
+    if ! check_health $port "$name" "$health_check_path"; then
+        log "ERROR: 健康检查失败，退出程序"
+        exit 1
     fi
 done
 
-# 启动根路径服务
-log "Starting root service on port 8080"
-(cd /home/pn/app/root && python -m http.server 8080) &
-
 # 启动 Traefik
 exec traefik --configFile=$TRAEFIK_CONFIG_FILE

traefik/dynamic.yml

@@ -1,18 +1,17 @@
 http:
   routers:
-    my-waeb-router:
-      rule: "PathPrefix(`/waeb`)"
-      service: noop@internal
-      middlewares:
-        - traefik-plugin-waeb
-      entryPoints:
-        - traefik
-
     root:
-      rule: "PathPrefix(`/`) && !PathPrefix(`/python`) && !PathPrefix(`/node`) && !PathPrefix(`/waeb`)"
-      service: root
+      rule: "PathPrefix(`/`) && !PathPrefix(`/python`) && !PathPrefix(`/node`) && !PathPrefix(`/traefik`)"
+      service: n8n-service
       priority: 1
 
+    traefik-dashboard:
+      rule: "PathPrefix(`/traefik`)"
+      service: api@internal
+      priority: 2
+      middlewares:
+        - traefik-dashboard-stripprefix
+
     python-service:
       rule: "PathPrefix(`/python`)"
       service: python-service
@@ -28,6 +27,11 @@ http:
         - node-service-stripprefix
 
   middlewares:
+    traefik-dashboard-stripprefix:
+      stripPrefix:
+        prefixes:
+          - "/traefik"
+
     python-service-stripprefix:
       stripPrefix:
         prefixes:
@@ -37,17 +41,12 @@ http:
       stripPrefix:
         prefixes:
           - "/node"
-
-    traefik-plugin-waeb:
-      plugin:
-        traefik-plugin-waeb:
-          root: "/home/pn/app/waeb"
-
+          
   services:
-    root:
+    n8n-service:
       loadBalancer:
         servers:
-          - url: "http://localhost:8080"
+          - url: "http://localhost:5678"
 
     python-service:
       loadBalancer:

traefik/traefik.yml

@@ -8,8 +8,6 @@ log:
 entryPoints:
   web:
     address: ":7860"
-  traefik:
-    address: ":8080"
 
 providers:
   file:
@@ -20,9 +18,24 @@ api:
   insecure: true
   dashboard: true
 
-# 添加 Waeb 插件配置
+serversTransport:
+  maxIdleConnsPerHost: 100
+
+pilot:
+  dashboard: false
+
 experimental:
   plugins:
-    traefik-plugin-waeb:
-      moduleName: "github.com/tomMoulard/traefik-plugin-waeb"
-      version: "v1.0.1"
+    enabled: false
+
+accessLog: {}
+
+tracing: {}
+
+metrics: {}
+
+# 设置 Traefik 以 pn 用户权限运行
+users:
+  - name: pn
+    uid: 1000
+    gid: 1000