From 452a8805fbcbfcef11425a9557504bf2ea2f99bf Mon Sep 17 00:00:00 2001
From: colaftc <colaftc@gmail.com>
Date: Fri, 14 Nov 2025 17:42:32 +0800
Subject: [PATCH] fix: woodpecker

---
 .woodpecker.yml                     |  4 +--
 docker-compose-woodpecker-fixed.yml | 48 +++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 docker-compose-woodpecker-fixed.yml

diff --git a/.woodpecker.yml b/.woodpecker.yml
index ce144f6..d68076f 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -28,7 +28,7 @@ steps:
         from_secret: deploy_password
       port: 22
       script:
-        - cd /path/to/your/project
+        - cd /root/project/erp
         - git pull origin main
         - uv sync
         - uv run python manage.py migrate
@@ -42,4 +42,4 @@ steps:
           # 验证 screen 会话是否创建成功
           screen -ls | grep erp && echo "ERP server started in screen session"
     when:
-      - evaluate: 'CI_PIPELINE_STATUS == "success"'
+      evaluate: 'CI_PIPELINE_STATUS == "success"'
diff --git a/docker-compose-woodpecker-fixed.yml b/docker-compose-woodpecker-fixed.yml
new file mode 100644
index 0000000..50797b8
--- /dev/null
+++ b/docker-compose-woodpecker-fixed.yml
@@ -0,0 +1,48 @@
+version: '3'
+
+services:
+  wood-server:
+    image: woodpeckerci/woodpecker-server:latest
+    container_name: wood-server
+    restart: always
+    ports:
+      - "55660:8000"   # HTTP/Web UI: 宿主机55660映射到容器8000
+      # 9000端口不需要暴露，仅容器内部通信
+    volumes:
+      - wood-server-data:/var/lib/woodpecker/
+    environment:
+      # Gitea 配置
+      - WOODPECKER_GITEA=true
+      - WOODPECKER_GITEA_URL=http://8.148.215.233:5000
+      - WOODPECKER_GITEA_CLIENT=7f99583a-e440-46d0-b999-e6289663d523
+      - WOODPECKER_GITEA_SECRET=gto_jgmvrx3bevjhihhqplgsglptpqxetbhsdwh2ye4uko7idtuwkfsa
+      
+      # Woodpecker 服务器配置
+      - WOODPECKER_HOST=http://8.148.215.233:55660
+      - WOODPECKER_AGENT_SECRET=hacking9527
+      
+      # Webhook 配置（修复 400 错误）
+      - WOODPECKER_WEBHOOK_SECRET=hacking9527
+      
+      # 管理员设置（使用Gitea用户名，不是邮箱）
+      - WOODPECKER_ADMIN=colaftc
+      
+      # 日志级别
+      - WOODPECKER_LOG_LEVEL=info
+
+  wood-agent:
+    image: woodpeckerci/woodpecker-agent:latest
+    container_name: wood-agent
+    restart: always
+    depends_on:
+      - wood-server
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - WOODPECKER_SERVER=wood-server:9000  # 修复：使用正确的容器名
+      - WOODPECKER_AGENT_SECRET=hacking9527
+      - WOODPECKER_MAX_WORKFLOWS=2
+      - WOODPECKER_LOG_LEVEL=info
+
+volumes:
+  wood-server-data: