diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index f92bf49..d1cfc2d 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,11 +4,14 @@ on: branches: [master] jobs: deploy: - runs-on: ubuntu-latest + # ========== 核心修复:替换为具体Ubuntu版本,解决运行期匹配问题 ========== + runs-on: ubuntu-22.04 env: # 从组织级Secrets读取,不用在仓库重复配置 K3S_HOST: ${{ secrets.K3S_HOST }} APP_NAME: ${{ gitea.repo_name }} + # 补充:若后续要推送镜像,需替换为实际镜像仓库地址(比如你的Gitea镜像仓库) + REGISTRY: 116.204.74.41:3000/red-future steps: # ========== 核心修改:替换checkout源,避开GitHub ========== - name: 拉取代码(Gitea官方源) @@ -20,6 +23,15 @@ jobs: # 1. 初始化 Docker Buildx(原内容不变) - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + + # 2. 可选:登录镜像仓库(若需推送镜像,取消注释并配置密钥) + # - name: Login to Gitea Registry + # uses: docker/login-action@v3 + # with: + # registry: 116.204.74.41:3000 + # username: ${{ secrets.GITEA_USER }} + # password: ${{ secrets.GITEA_PWD }} + # 3. 构建+推送(原内容不变) - name: Build and push uses: docker/build-push-action@v5 @@ -29,19 +41,20 @@ jobs: 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. 修复后的SSH部署步骤(解决路径+命名空间问题) - name: SSH部署K3s run: | mkdir -p ~/.ssh echo "${{ secrets.K3S_PEM_KEY }}" > k3s.pem chmod 600 k3s.pem - # ========== 修正1:上传「仓库根目录的deploy.yaml」(不是workflows里的deploy.yml) ========== - # 注意:路径是 ./deploy.yaml(仓库根目录),不是 .gitea/workflows/ 下的文件 + # ========== 修正1:上传仓库根目录的deploy.yaml到K3s临时目录 ========== scp -i k3s.pem -o StrictHostKeyChecking=no ./deploy.yaml root@${K3S_HOST}:/tmp/ - # ========== 修正2:kubectl指向临时目录的deploy.yaml,补充命名空间 ========== + # ========== 修正2:kubectl指向临时文件+补充命名空间 ========== ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD - kubectl apply -f /tmp/deploy.yaml # 替换原/k8s/deploy.yaml - kubectl rollout restart deployment ${APP_NAME} -n default # 加-n default避免找不到资源 - rm -f /tmp/deploy.yaml # 可选:部署后删除临时文件 + kubectl apply -f /tmp/deploy.yaml + kubectl rollout restart deployment ${APP_NAME} -n default + rm -f /tmp/deploy.yaml # 可选:清理临时文件 CMD \ No newline at end of file