From 1e4afacac7323ab21a54001d373d53f960e7cb0e Mon Sep 17 00:00:00 2001
From: shishengliang <shishengliang@shishengliangdeMacBook-Air.local>
Date: Wed, 16 Sep 2026 10:49:39 +0800
Subject: [PATCH] ci: sync Woodpecker configuration from main

---
 woodpecker.yml | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/woodpecker.yml b/woodpecker.yml
index 14f4d5e..353c045 100644
--- a/woodpecker.yml
+++ b/woodpecker.yml
@@ -1,3 +1,7 @@
+# 凭据通过 Woodpecker Secret 注入（HARBOR_USERNAME / HARBOR_PASSWORD），
+# 不再把 Harbor 账号密码 base64 后写进流水线脚本。
+# 镜像推送只在 push / manual 触发：pull_request 不应向生产 registry 推送。
+
 steps:
   - name: npm-build
     image: node:22-alpine
@@ -12,14 +16,17 @@ steps:
         - main
         - feature/asset-statistics
     commands: |
-      cd $CI_WORKSPACE
-      npm ci
+      set -eu
+      cd "$CI_WORKSPACE"
+      node --version
+      npm --version
+      npm ci --registry=https://registry.npmmirror.com/ --no-audit --no-fund --loglevel=verbose
       npm run lint
       npm test
       npm run build
 
       # 获取分支名
-      BRANCH_NAME=$(echo $CI_COMMIT_BRANCH | tr / -)
+      BRANCH_NAME=$(echo ${CI_COMMIT_BRANCH:-manual} | tr / -)
       echo "Branch name: $BRANCH_NAME"
 
       # 版本号: 分支名-package.json版本
@@ -30,10 +37,10 @@ steps:
 
   - name: docker-build
     image: docker:24.0.5-cli
+    depends_on: [npm-build]
     when:
       event:
         - push
-        - pull_request
         - manual
       branch:
         - master
@@ -42,25 +49,22 @@ steps:
         - feature/asset-statistics
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      HARBOR_USERNAME:
+        from_secret: HARBOR_USERNAME
+      HARBOR_PASSWORD:
+        from_secret: HARBOR_PASSWORD
     commands: |
       PROJECT_VERSION=$(cat $CI_WORKSPACE/project_version.txt)
       MODULE_NAME=ln-bi
+      REGISTRY=harbor.lnh2e.com
+      PROJECT=lingniu-v1
 
       echo "Building Docker image: $MODULE_NAME:$PROJECT_VERSION"
 
       cd $CI_WORKSPACE
+      docker build -t $REGISTRY/$PROJECT/$MODULE_NAME:$PROJECT_VERSION .
 
-      docker build -t harbor.lnh2e.com/lingniu-v1/$MODULE_NAME:$PROJECT_VERSION .
+      echo "$HARBOR_PASSWORD" | docker login $REGISTRY -u "$HARBOR_USERNAME" --password-stdin
 
-      mkdir -p /root/.docker
-      cat > /root/.docker/config.json <<EOF
-      {
-        "auths": {
-          "harbor.lnh2e.com": {
-            "auth": "$(echo Y2ljZDpMbkBjaWNkMDE=)"
-          }
-        }
-      }
-      EOF
-
-      docker push harbor.lnh2e.com/lingniu-v1/$MODULE_NAME:$PROJECT_VERSION
+      docker push $REGISTRY/$PROJECT/$MODULE_NAME:$PROJECT_VERSION