update

Dockerfile

@@ -27,6 +27,7 @@ RUN mkdir -p /home/pn/app/traefik /home/pn/app/python /home/pn/app/node /home/pn
 
 # 复制配置文件和启动脚本
 COPY --chown=pn:pn traefik/traefik.yml /home/pn/app/traefik/
+COPY --chown=pn:pn traefik/dynamic.yml /home/pn/app/traefik/
 COPY --chown=pn:pn start.sh /home/pn/app/start.sh
 COPY --chown=pn:pn services.json /home/pn/app/services.json
 RUN chmod +x /home/pn/app/start.sh

start.sh

@@ -1,12 +1,6 @@
 #!/bin/bash
 set -e
 
-# 在文件开头的适当位置添加以下命令
-mkdir -p /home/pn/app/waeb
-echo "Hello from Waeb!" > /home/pn/app/waeb/index.html
-chmod 755 /home/pn/app/waeb
-chmod 644 /home/pn/app/waeb/index.html
-
 # 添加日志函数
 log() {
     echo "[$(date +'%Y-%m-%d %H:%M:%S')] $1"
@@ -18,86 +12,6 @@ trap "log '收到终止信号，关闭进程...'; kill \$(jobs -p) 2>/dev/null;
 # 读取服务配置
 services=$(jq -c '.[]' services.json)
 
-# 动态生成 Traefik 配置
-generate_traefik_config() {
-    local dynamic_config="/home/pn/app/traefik/dynamic.yml"
-    echo "http:" > $dynamic_config
-    echo "  routers:" >> $dynamic_config
-    
-    # 修改 Waeb 路由器配置
-    echo "    my-waeb-router:" >> $dynamic_config
-    echo "      rule: \"PathPrefix(\`/waeb\`)\"" >> $dynamic_config
-    echo "      service: noop@internal" >> $dynamic_config
-    echo "      middlewares:" >> $dynamic_config
-    echo "        - traefik-plugin-waeb" >> $dynamic_config
-    echo "      entryPoints:" >> $dynamic_config
-    echo "        - web" >> $dynamic_config
-    
-    # 添加根路径路由
-    echo "    root:" >> $dynamic_config
-    echo "      rule: \"PathPrefix(\`/\`) && !PathPrefix(\`/python\`) && !PathPrefix(\`/node\`) && !PathPrefix(\`/waeb\`)\"" >> $dynamic_config
-    echo "      service: root" >> $dynamic_config
-    echo "      priority: 1" >> $dynamic_config
-
-    echo "$services" | while read -r service; do
-        name=$(echo $service | jq -r '.name')
-        port=$(echo $service | jq -r '.port')
-        path_prefix=$(echo $service | jq -r '.path_prefix')
-
-        echo "    $name:" >> $dynamic_config
-        echo "      rule: \"PathPrefix(\`$path_prefix\`)\"" >> $dynamic_config
-        echo "      service: $name" >> $dynamic_config
-        echo "      priority: 2" >> $dynamic_config
-        echo "      middlewares:" >> $dynamic_config
-        echo "        - ${name}-stripprefix" >> $dynamic_config
-    done
-
-    echo "  middlewares:" >> $dynamic_config
-    echo "$services" | while read -r service; do
-        name=$(echo $service | jq -r '.name')
-        path_prefix=$(echo $service | jq -r '.path_prefix')
-
-        echo "    ${name}-stripprefix:" >> $dynamic_config
-        echo "      stripPrefix:" >> $dynamic_config
-        echo "        prefixes:" >> $dynamic_config
-        echo "          - \"$path_prefix\"" >> $dynamic_config
-    done
-
-    # 添加 Waeb 插件中间件
-    echo "    traefik-plugin-waeb:" >> $dynamic_config
-    echo "      plugin:" >> $dynamic_config
-    echo "        traefik-plugin-waeb:" >> $dynamic_config
-    echo "          root: \"/home/pn/app/waeb\"" >> $dynamic_config
-
-    echo "  services:" >> $dynamic_config
-
-    # 添加根路径服务
-    echo "    root:" >> $dynamic_config
-    echo "      loadBalancer:" >> $dynamic_config
-    echo "        servers:" >> $dynamic_config
-    echo "          - url: \"http://localhost:8080\"" >> $dynamic_config
-
-    echo "$services" | while read -r service; do
-        name=$(echo $service | jq -r '.name')
-        port=$(echo $service | jq -r '.port')
-
-        echo "    $name:" >> $dynamic_config
-        echo "      loadBalancer:" >> $dynamic_config
-        echo "        servers:" >> $dynamic_config
-        echo "          - url: \"http://localhost:$port\"" >> $dynamic_config
-    done
-}
-
-# 生成 Traefik 配置
-generate_traefik_config
-
-# 替换 Traefik 配置文件中的环境变量
-envsubst < /home/pn/app/traefik/dynamic.yml > /tmp/dynamic.yml
-mv /tmp/dynamic.yml /home/pn/app/traefik/dynamic.yml
-
-log "Traefik 配置文件内容："
-cat /home/pn/app/traefik/dynamic.yml
-
 # 创建测试文件并写入内容
 touch /home/pn/app/python/hi.txt
 echo "Hello, Python!" > /home/pn/app/python/hi.txt
@@ -162,9 +76,9 @@ echo "$services" | while read -r service; do
     fi
 done
 
-# 启动 Traefik
-exec traefik --configFile=$TRAEFIK_CONFIG_FILE
-
 # 启动根路径服务
 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

@@ -0,0 +1,60 @@
+http:
+  routers:
+    my-waeb-router:
+      rule: "PathPrefix(`/waeb`)"
+      service: noop@internal
+      middlewares:
+        - traefik-plugin-waeb
+      entryPoints:
+        - web
+
+    root:
+      rule: "PathPrefix(`/`) && !PathPrefix(`/python`) && !PathPrefix(`/node`) && !PathPrefix(`/waeb`)"
+      service: root
+      priority: 1
+
+    python-service:
+      rule: "PathPrefix(`/python`)"
+      service: python-service
+      priority: 2
+      middlewares:
+        - python-service-stripprefix
+
+    node-service:
+      rule: "PathPrefix(`/node`)"
+      service: node-service
+      priority: 2
+      middlewares:
+        - node-service-stripprefix
+
+  middlewares:
+    python-service-stripprefix:
+      stripPrefix:
+        prefixes:
+          - "/python"
+
+    node-service-stripprefix:
+      stripPrefix:
+        prefixes:
+          - "/node"
+
+    traefik-plugin-waeb:
+      plugin:
+        traefik-plugin-waeb:
+          root: "/home/pn/app/waeb"
+
+  services:
+    root:
+      loadBalancer:
+        servers:
+          - url: "http://localhost:8080"
+
+    python-service:
+      loadBalancer:
+        servers:
+          - url: "http://localhost:8000"
+
+    node-service:
+      loadBalancer:
+        servers:
+          - url: "http://localhost:8001"