diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index d80d4a0..1dfab15 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -6,6 +6,8 @@ name: build # 依赖仓库 Secrets:NEXUS_USER / NEXUS_PASSWORD(docker-hosted 推送)/ DEPLOY_TOKEN(webhook 鉴权) # 依赖 docker/Dockerfile(由 projman 注入,开发者也可自备——已写则尊重不覆盖) # maven 依赖走 http://nexus:8081/repository/maven-public/(infra-infra-net 内容器名直连,匿名可拉公司 yh-* starter) +# runner 内网禁公网(apk 拉不到 dl-cdn,装不了 curl):git 用 docker:24 镜像自带; +# webhook 通知用 alpine 自带 busybox wget(--post-data 发 JSON POST)代替 curl,全程不依赖公网 on: push: @@ -21,13 +23,11 @@ jobs: build-push: runs-on: ubuntu-latest container: + # 内网无外网,apk add 不可用;runner 上 docker:24 镜像自带 git(apk 报错仅缺 curl 可证),无需另装 image: docker:24 options: --network infra-infra-net steps: - - name: 安装 git / curl(alpine) - run: apk add --no-cache git curl - - # 内网 Gitea 无法访问 GitHub 拉 actions/checkout,手动 clone 本仓库 + # 内网 Gitea 无法访问 GitHub 拉 actions/checkout,手动 clone 本仓库(git 为 docker:24 镜像自带) - name: 拉取源码(内网无 GitHub,手动 clone 本仓库) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -78,9 +78,11 @@ jobs: echo "TAG=${TAG}" >> "$GITHUB_ENV" # 通知 projman:webhook 收到后只建档 Release(status=pending),部署由运维在 DeployTab 手动触发(App.deployMode=manual) + # 内网无 curl,用 alpine 自带 busybox wget 发 JSON POST(4xx/5xx 时 wget 非零退出让 job 变红) - name: 通知 projman 建档(部署由运维手动触发) run: | - curl -sS -X POST "http://192.168.10.160:8090/projman/api/deploy/webhook" \ - -H "Content-Type: application/json" \ - -H "X-Deploy-Token: ${{ secrets.DEPLOY_TOKEN }}" \ - -d "{\"app\":\"aca-classroom\",\"tag\":\"${TAG}\",\"sha\":\"${GITHUB_SHA}\",\"message\":\"${COMMIT_MSG}\"}" + wget -qO- \ + --header="Content-Type: application/json" \ + --header="X-Deploy-Token: ${{ secrets.DEPLOY_TOKEN }}" \ + --post-data="{\"app\":\"aca-classroom\",\"tag\":\"${TAG}\",\"sha\":\"${GITHUB_SHA}\",\"message\":\"${COMMIT_MSG}\"}" \ + "http://192.168.10.160:8090/projman/api/deploy/webhook"