Merge branch 'feature/workflow' of http://116.204.74.41:3000/red-future/admin-ui into feature/workflow

This commit is contained in:
2026-05-23 17:56:56 +08:00
2 changed files with 11 additions and 5 deletions

View File

@@ -35,13 +35,19 @@ jobs:
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 部署步骤不变
# 4. 核心修改先上传deploy.yaml到K3s服务器再执行kubectl
- name: SSH部署K3s
run: |
run:
mkdir -p ~/.ssh
echo "${{ secrets.K3S_PEM_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/
ssh -i k3s.pem -o StrictHostKeyChecking=no root@${K3S_HOST} << CMD
kubectl apply -f /k8s/deploy.yaml
kubectl rollout restart deployment ${APP_NAME}
kubectl apply -f /tmp/deploy.yaml
kubectl rollout restart deployment ${APP_NAME} -n default
# 可选:部署完成后删除临时文件,清理服务器
rm -f /tmp/deploy.yaml
CMD

View File

@@ -30,6 +30,6 @@ COPY ngnix.conf /etc/nginx/conf.d/default.conf
# 复制SSL证书
COPY ssl/* /etc/nginx/ssl/
EXPOSE 80 443
EXPOSE 443
CMD ["nginx", "-g", "daemon off;"]