From 74a06e9982e45e57fc009faf16f04a00d9f6ce1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=96=8C?= <259278618@qq.com> Date: Fri, 22 May 2026 14:31:23 +0800 Subject: [PATCH] 1 --- .gitea/workflows/deploy.yml | 20 ++++++++------------ Dockerfile | 3 --- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 6a1a20e..24c5415 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -7,27 +7,23 @@ jobs: deploy: runs-on: ubuntu-latest env: - # 从组织级Secrets读取,不用在仓库重复配置 K3S_HOST: ${{ secrets.K3S_HOST }} APP_NAME: ${{ gitea.repo_name }} + REPO_URL: ${{ gitea.repository.clone_url }} + REF: ${{ gitea.ref_name }} steps: - - name: 拉取代码 - uses: actions/checkout@v4 + # 直接克隆到当前目录,不先删除 + - name: 本地克隆代码 + run: | + git clone --depth 1 --branch $REF $REPO_URL ./temp + mv ./temp/* ./ + rm -rf ./temp - name: SSH部署K3s run: | mkdir -p ~/.ssh - # 写入组织配置的SSH私钥 echo "${{ secrets.K3S_SSH_KEY }}" > k3s.pem chmod 600 k3s.pem - # 调试:验证私钥是否正确写入 - 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 /k8s/deploy.yaml kubectl rollout restart deployment ${APP_NAME} diff --git a/Dockerfile b/Dockerfile index cfb3adb..e475fa8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,3 @@ -FROM gitea/gitea:latest -# 拷贝预设工作流模板到容器内仓库模板目录 -COPY ./workflow_template/.gitea /data/gitea/templates/repo/.gitea # 多阶段构建 - 第一阶段:编译(使用已安装的镜像) FROM golang:1.26-alpine3.23 AS builder