From cd6e56e09dcc379fd68f190b19815d2ce50f3c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com>
Date: Sat, 23 May 2026 16:32:14 +0800
Subject: [PATCH] dockerfile

---
 .gitea/workflows/deploy.yml | 53 ++++++++++++-------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index e26ab4d..6a1a20e 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -7,47 +7,28 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     env:
-      K3S_HOST: 121.37.117.181
+      # 从组织级Secrets读取，不用在仓库重复配置
+      K3S_HOST: ${{ secrets.K3S_HOST }}
       APP_NAME: ${{ gitea.repo_name }}
-      REGISTRY: 你的镜像仓库地址 # 比如 docker.io/你的用户名
     steps:
-      - uses: gitea/actions/checkout@v4
+      - name: 拉取代码
+        uses: actions/checkout@v4
 
-      # 1. 初始化 Docker Buildx
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # 2. 登录镜像仓库（按需）
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PWD }}
-
-      # 3. 构建+推送，启用缓存
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.APP_NAME }}:${{ gitea.sha }}
-          # 缓存配置：推送到镜像仓库
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.APP_NAME }}:buildcache,mode=max
-
-      # 4. 核心修改：先上传deploy.yaml到K3s服务器，再执行kubectl
       - name: SSH部署K3s
-        run:
+        run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem
+          # 写入组织配置的SSH私钥
+          echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem
           chmod 600 k3s.pem
-          # 关键1：把Gitea仓库里的deploy.yaml上传到K3s服务器临时目录（/tmp）
-          # 注意：如果你的deploy.yaml不在仓库根目录，要修改./deploy.yaml为实际路径
-          scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/
-          # 关键2：执行kubectl时指向临时目录的文件，而非不存在的/k8s/
+          # 调试：验证私钥是否正确写入
+          echo "私钥文件权限："
+          ls -l k3s.pem
+          echo "私钥头部（仅前5行）："
+          head -5 k3s.pem
+          # 测试连接（会输出服务器主机名和kubectl版本）
+          ssh -i k3s.pem -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@${K3S_HOST} "hostname && kubectl version --client"
+          # 正式执行部署命令
           ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
-            kubectl apply -f /tmp/deploy.yaml
-            kubectl rollout restart deployment ${APP_NAME} -n default
-            # 可选：部署完成后删除临时文件，清理服务器
-            rm -f /tmp/deploy.yaml
+            kubectl apply -f /k8s/deploy.yaml
+            kubectl rollout restart deployment ${APP_NAME}
           CMD
\ No newline at end of file