From 06ee85cf8db71d592acb69ad7d76e707c9e19195 Mon Sep 17 00:00:00 2001 From: chenxing Date: Mon, 10 Aug 2026 15:42:00 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E5=89=8D=E7=AB=AF=E6=96=B9=E6=A1=88B=20-?= =?UTF-8?q?=20=E8=BD=AF=E9=93=BE=E6=8E=A5=E7=89=88=E6=9C=AC=E5=8C=96?= =?UTF-8?q?=E9=83=A8=E7=BD=B2(=E4=B8=8D=E5=86=8D=E6=89=93=E9=95=9C?= =?UTF-8?q?=E5=83=8F)=20+=20caddy-switch=20=E5=B7=A5=E4=BD=9C=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/caddy-switch.yml | 62 +++++++++++++++++++++ .gitea/workflows/ci.yml | 93 ------------------------------- .gitea/workflows/deploy.yml | 77 +++++++++++++++++++++++++ 3 files changed, 139 insertions(+), 93 deletions(-) create mode 100644 .gitea/workflows/caddy-switch.yml delete mode 100644 .gitea/workflows/ci.yml create mode 100644 .gitea/workflows/deploy.yml diff --git a/.gitea/workflows/caddy-switch.yml b/.gitea/workflows/caddy-switch.yml new file mode 100644 index 0000000..1ee4970 --- /dev/null +++ b/.gitea/workflows/caddy-switch.yml @@ -0,0 +1,62 @@ +name: switch-caddy-to-fileserver + +# 一次性:把 Caddy 对 /userbase* 的反代改为 file_server 直接读取软链接目录 +# 触发:Gitea 网页 Actions -> 本工作流 -> Run workflow(仅执行一次) +# 做了什么: +# 1) 确保 /data/www/userbase/releases 与初始 front 软链接存在(caddy 启动前 root 必须存在) +# 2) 备份并原地修改宿主 Caddyfile:仅替换唯一行 `reverse_proxy userbase-front:80` +# -> root * /data/www/userbase/front + file_server + try_files(SPA 回退) +# 3) 按现有 caddy 容器的 image/端口/挂载/网络 重建(追加 /data/www/userbase 挂载) +# 4) 移除已被取代的 userbase-front 容器 +# 回滚:/opt/docker/infra/Caddyfile.bak-* 备份 + docker rm -f caddy 后用旧参数重建。 + +on: + workflow_dispatch: + +jobs: + switch: + runs-on: ubuntu-latest + container: + image: docker:24 + steps: + - name: Recreate caddy (file_server + mount /data/www/userbase) + run: | + set -e + apk add --no-cache jq + + # 0) 前端目录与初始软链接(避免 caddy 因 root 不存在而启动失败) + docker run --rm -v /data/www/userbase:/data/www/userbase alpine sh -c ' + mkdir -p /data/www/userbase/releases + if [ ! -e /data/www/userbase/front ]; then + mkdir -p /data/www/userbase/releases/initial + ln -sfn /data/www/userbase/releases/initial /data/www/userbase/front + fi + ' + + # 1) 备份 + 替换宿主 Caddyfile 中唯一的前后端反代行 + docker run --rm -v /opt/docker/infra:/opt/docker/infra alpine sh -c ' + cp -f /opt/docker/infra/Caddyfile /opt/docker/infra/Caddyfile.bak-$(date +%Y%m%d-%H%M) + sed -i "s#reverse_proxy userbase-front:80#root * /data/www/userbase/front\n\tfile_server\n\ttry_files {path} /index.html#" /opt/docker/infra/Caddyfile + echo "=== 新的 /userbase 块 ===" + grep -n -A4 "handle_path /userbase" /opt/docker/infra/Caddyfile + ' + + # 2) 按现有 caddy 容器参数重建(保留原 image/端口/挂载/网络,追加前端目录挂载) + docker inspect caddy > /tmp/c.json + IMG=$(jq -r '.[0].Config.Image' /tmp/c.json) + NET=$(jq -r '.[0].HostConfig.NetworkMode' /tmp/c.json) + PORTS=$(jq -r '.[0].HostConfig.PortBindings | to_entries[]? | "-p \(.value[0].HostPort):\(.key | rtrimstr("/tcp"))"' /tmp/c.json | tr "\n" " ") + BINDS=$(jq -r '.[0].HostConfig.Binds[]? | "-v \(.)"' /tmp/c.json | tr "\n" " ") + CMD=$(jq -r '.[0].Config.Cmd | join(" ")' /tmp/c.json) + echo "recreate caddy: IMG=$IMG NET=$NET PORTS=[$PORTS] BINDS=[$BINDS] CMD=[$CMD]" + + docker rm -f caddy 2>/dev/null || true + # shellcheck disable=SC2086 + docker run -d --name caddy --restart unless-stopped --network "$NET" $PORTS $BINDS -v /data/www/userbase:/data/www/userbase "$IMG" $CMD + + sleep 6 + docker ps --format 'table {{.Names}}\t{{.Status}}\t{{.Image}}' | grep -E 'caddy|userbase' || true + + # 3) 旧的 userbase-front 容器已被 Caddy file_server 取代 + docker rm -f userbase-front 2>/dev/null || echo "userbase-front already removed" + echo "CADDY SWITCH DONE" diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml deleted file mode 100644 index 30accc8..0000000 --- a/.gitea/workflows/ci.yml +++ /dev/null @@ -1,93 +0,0 @@ -name: ci-userbase-front - -# 前端标准化 CI:npm ci -> vite build --mode prod(-> dist/prod) -> docker build(nginx) -> 推 Nexus -> 部署 160 -# 触发:push 到 main / 手动 Run workflow -# 依赖仓库 Actions Secrets:NEXUS_USER / NEXUS_PASSWORD(ci-docker 账号,仅 docker-hosted 推送权) -on: - push: - branches: [main] - workflow_dispatch: - inputs: - tag: - description: 'image tag (default = short sha)' - required: false - default: 'auto' - deploy: - description: 'deploy to 160 after build (auto / skip)' - required: false - default: 'auto' - -jobs: - build-and-push: - runs-on: ubuntu-latest - # docker:24 自带 docker CLI,复用宿主 docker daemon(act_runner v0.6.1 已挂载 docker.sock)。 - container: - image: docker:24 - steps: - - name: Install git + node (alpine) - run: apk add --no-cache git nodejs npm - - # 内网 Gitea 无法访问 github.com 拉取 actions/checkout,改为直接 clone 本仓库 - - name: Checkout (manual, internal Gitea) - run: | - git clone --depth 1 --branch main http://192.168.10.160:3000/${GITHUB_REPOSITORY}.git /tmp/src - cp -a /tmp/src/. . - rm -rf /tmp/src - - - name: Compute image tag - id: meta - run: | - if [ "${{ inputs.tag }}" = "auto" ] || [ -z "${{ inputs.tag }}" ]; then - echo "tag=$(echo ${GITHUB_SHA} | cut -c1-7)" >> $GITHUB_OUTPUT - else - echo "tag=${{ inputs.tag }}" >> $GITHUB_OUTPUT - fi - - - name: Install deps - run: npm ci - - - name: Build (vite --mode prod -> dist/prod) - run: npm run build:prod - - - name: Login to Nexus docker registry - run: echo "${{ secrets.NEXUS_PASSWORD }}" | docker login nexus:8083 -u ${{ secrets.NEXUS_USER }} --password-stdin - - # 构建上下文 = 仓库根(front),Dockerfile 读取 dist/prod 构建 nginx 静态镜像 - - name: Build image - run: docker build -t nexus:8083/docker-hosted/userbase-front:${{ steps.meta.outputs.tag }} -f docker/Dockerfile . - - - name: Push image - run: docker push nexus:8083/docker-hosted/userbase-front:${{ steps.meta.outputs.tag }} - - - name: Report build - run: echo "pushed nexus:8083/docker-hosted/userbase-front:${{ steps.meta.outputs.tag }}" - - # 部署阶段(仅在 push 或手动 dispatch deploy=auto 时执行),运行在 160 的 act_runner 上。 - # 前端容器只连 infra-infra-net,由 Caddy(external) 经 reverse_proxy userbase-front:80 转发,无需映射宿主机端口。 - - name: Deploy (rollout with rollback) - if: github.event_name == 'push' || inputs.deploy == 'auto' - run: | - set +e - IMG=nexus:8083/docker-hosted/userbase-front:${{ steps.meta.outputs.tag }} - echo "deploying $IMG" - echo "${{ secrets.NEXUS_PASSWORD }}" | docker login nexus:8083 -u ${{ secrets.NEXUS_USER }} --password-stdin - docker pull "$IMG" - RB=userbase-front:rb-$(date +%s) - docker tag userbase-front:latest "$RB" 2>/dev/null || true - docker stop userbase-front 2>/dev/null; docker rm -f userbase-front 2>/dev/null - docker run -d --name userbase-front --restart unless-stopped --network infra-infra-net "$IMG" - OK=0 - for i in $(seq 1 20); do - sleep 5 - ST=$(docker inspect -f '{{.State.Running}}' userbase-front 2>/dev/null || echo false) - if [ "$ST" = "true" ]; then OK=1; break; fi - done - if [ "$OK" = "0" ]; then - echo "!! UNHEALTHY -> rollback to userbase-front:latest" - docker stop userbase-front 2>/dev/null; docker rm -f userbase-front 2>/dev/null - docker run -d --name userbase-front --restart unless-stopped --network infra-infra-net userbase-front:latest - echo "rolled back"; exit 7 - fi - echo "DEPLOY OK: $IMG" - docker tag "$IMG" userbase-front:latest - docker ps --format 'table {{.Names}}\t{{.Status}}\t{{.Image}}' | grep userbase-front || true diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..edc7275 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,77 @@ +name: deploy-userbase-front + +# 前端部署(方案 B:不打包镜像,直接部署静态文件 + 软链接版本控制) +# 触发:push 到 main / 手动 Run workflow +# 核心:vite build --mode prod -> dist/prod +# -> 拷贝到 /data/www/userbase/releases// +# -> 原子切换 /data/www/userbase/front 软链接指向新版本 +# -> 保留最近 5 个版本,更早自动清理(秒级回滚) +# 不再构建/推送 nginx 镜像;Caddy 由 caddy-switch 工作流一次性改为 file_server。 +# 依赖:160 宿主的 docker daemon(runner 已挂 docker.sock)。无需 NEXUS secret。 + +on: + push: + branches: [main] + workflow_dispatch: + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + # docker:24 自带 docker CLI,复用宿主 docker daemon(act_runner v0.6.1 已挂载 docker.sock)。 + # 切勿再声明 volumes: docker.sock(会报 Duplicate mount point)。 + container: + image: docker:24 + steps: + - name: Install git (alpine) + run: apk add --no-cache git + + # 内网 Gitea 无法访问 github.com 拉取 actions/checkout,改为直接 clone 本仓库 + - name: Checkout (manual, internal Gitea) + run: | + git clone --depth 1 --branch main http://192.168.10.160:3000/${GITHUB_REPOSITORY}.git /tmp/src + cp -a /tmp/src/. . + rm -rf /tmp/src + + # 构建 + 部署:在 node:20 容器里完成(源码经 docker cp 传入,并挂载宿主 /data/www/userbase) + - name: Build & Deploy (symlink versioning) + run: | + set -e + # 版本号:short sha + 时间戳(可改为 git tag 优先,见下) + VERSION="$(echo ${GITHUB_SHA} | cut -c1-7)-$(date +%Y%m%d-%H%M)" + echo "Deploying version: $VERSION" + + docker rm -f frontbuild 2>/dev/null || true + docker run -d --name frontbuild \ + -e VERSION="$VERSION" \ + -v /data/www/userbase:/data/www/userbase \ + -w /build node:20 sleep 3600 + + # 源码拷入构建容器(绕过 act 工作区非宿主路径的坑,与 service 的 mavenbuild 一致) + docker cp "${PWD}/." frontbuild:/build/ + + docker exec frontbuild sh -c ' + set -e + cd /build + # 去掉 Windows 专用 sass 二进制路径(Linux 容器内该路径无效,否则 build 报错) + sed -i "/SASS_BINARY_PATH/d" .npmrc + npm ci + npm run build:prod + ' + + # 部署:拷贝 dist/prod -> releases/,原子切换软链接 + docker exec frontbuild sh -c ' + set -e + cd /build + mkdir -p /data/www/userbase/releases/$VERSION + cp -r /build/dist/prod/. /data/www/userbase/releases/$VERSION/ + # 原子切换:ln -sfn 不跟随已有链接,直接替换指向 + ln -sfn /data/www/userbase/releases/$VERSION /data/www/userbase/front + echo "current symlink ->"; ls -la /data/www/userbase/front + # 清理旧版本,保留最近 5 个 + cd /data/www/userbase/releases + ls -1t | tail -n +6 | while read d; do echo "rm old: $d"; rm -rf "$d"; done + echo "remaining versions:"; ls -1t + ' + + docker rm -f frontbuild + echo "DEPLOY OK: $VERSION"