From 1c4e6d4905f95e896681e0f09a141dd8c3feeb7f Mon Sep 17 00:00:00 2001 From: chenhang Date: Thu, 9 Jul 2026 10:34:43 +0800 Subject: [PATCH] ci(docker): rename registry prune secrets --- .gitea/workflows/docker-image.yml | 12 ++++++------ docs/docker-image-ci.md | 4 ++-- docs/gitea-actions-ssh-deploy.md | 4 ++-- scripts/ci/prune-gitea-container-images.sh | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitea/workflows/docker-image.yml b/.gitea/workflows/docker-image.yml index 7d327d84..74ab4e54 100644 --- a/.gitea/workflows/docker-image.yml +++ b/.gitea/workflows/docker-image.yml @@ -133,18 +133,18 @@ jobs: - name: Prune Gitea registry images env: - GITEA_API_BASE_URL: ${{ secrets.GITEA_API_BASE_URL }} - GITEA_PACKAGE_TOKEN: ${{ secrets.GITEA_PACKAGE_TOKEN }} + REGISTRY_API_BASE_URL: ${{ secrets.REGISTRY_API_BASE_URL }} + REGISTRY_PACKAGE_TOKEN: ${{ secrets.REGISTRY_PACKAGE_TOKEN }} run: | set -eu - if [ -z "$GITEA_PACKAGE_TOKEN" ]; then - echo "Missing secret: GITEA_PACKAGE_TOKEN" >&2 + if [ -z "$REGISTRY_PACKAGE_TOKEN" ]; then + echo "Missing secret: REGISTRY_PACKAGE_TOKEN" >&2 exit 1 fi - GITEA_API_BASE_URL="${GITEA_API_BASE_URL:-https://gitea.banlv-ai.com/api/v1}" \ - GITEA_PACKAGE_KEEP_COUNT=3 \ + REGISTRY_API_BASE_URL="${REGISTRY_API_BASE_URL:-https://gitea.banlv-ai.com/api/v1}" \ + REGISTRY_PACKAGE_KEEP_COUNT=3 \ bash scripts/ci/prune-gitea-container-images.sh - name: Deploy image over SSH diff --git a/docs/docker-image-ci.md b/docs/docker-image-ci.md index b9dbb8c8..131f1609 100644 --- a/docs/docker-image-ci.md +++ b/docs/docker-image-ci.md @@ -23,8 +23,8 @@ | `REGISTRY_IMAGE` | `gitea.banlv-ai.com/admin/cozsweet-web` | 完整镜像仓库名,不包含 tag | | `REGISTRY_USERNAME` | `cozsweet-bot` | 镜像仓库用户名 | | `REGISTRY_PASSWORD` | `***` | 镜像仓库密码或访问令牌 | -| `GITEA_API_BASE_URL` | `https://gitea.banlv-ai.com/api/v1` | Gitea API 地址,用于清理旧镜像版本 | -| `GITEA_PACKAGE_TOKEN` | `***` | 具备 package 删除权限的 Gitea token | +| `REGISTRY_API_BASE_URL` | `https://gitea.banlv-ai.com/api/v1` | Gitea API 地址,用于清理旧镜像版本 | +| `REGISTRY_PACKAGE_TOKEN` | `***` | 具备 package 删除权限的 Gitea token | | `TEST_ENV_FILE` | `.env.local` 的完整内容 | 测试环境构建期环境变量 | | `PRODUCTION_ENV_FILE` | `.env.production` 的完整内容 | 生产环境构建期环境变量 | diff --git a/docs/gitea-actions-ssh-deploy.md b/docs/gitea-actions-ssh-deploy.md index e7c4faff..127d47cf 100644 --- a/docs/gitea-actions-ssh-deploy.md +++ b/docs/gitea-actions-ssh-deploy.md @@ -29,8 +29,8 @@ push test/main | `REGISTRY_IMAGE` | 镜像仓库,例如 `gitea.banlv-ai.com/admin/cozsweet-web` | | `REGISTRY_USERNAME` | registry 用户名 | | `REGISTRY_PASSWORD` | registry 密码或 token | -| `GITEA_API_BASE_URL` | Gitea API 地址,例如 `https://gitea.banlv-ai.com/api/v1` | -| `GITEA_PACKAGE_TOKEN` | 具备 package 删除权限的 Gitea token,用于清理旧镜像 tag | +| `REGISTRY_API_BASE_URL` | Gitea API 地址,例如 `https://gitea.banlv-ai.com/api/v1` | +| `REGISTRY_PACKAGE_TOKEN` | 具备 package 删除权限的 Gitea token,用于清理旧镜像 tag | | `TEST_ENV_FILE` | 测试环境 `.env.local` 内容 | | `PRODUCTION_ENV_FILE` | 生产环境 `.env.production` 内容 | diff --git a/scripts/ci/prune-gitea-container-images.sh b/scripts/ci/prune-gitea-container-images.sh index b41cade8..f60fb446 100755 --- a/scripts/ci/prune-gitea-container-images.sh +++ b/scripts/ci/prune-gitea-container-images.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash set -euo pipefail -KEEP_COUNT="${GITEA_PACKAGE_KEEP_COUNT:-3}" -API_BASE_URL="${GITEA_API_BASE_URL:-https://gitea.banlv-ai.com/api/v1}" -TOKEN="${GITEA_PACKAGE_TOKEN:-}" +KEEP_COUNT="${REGISTRY_PACKAGE_KEEP_COUNT:-3}" +API_BASE_URL="${REGISTRY_API_BASE_URL:-https://gitea.banlv-ai.com/api/v1}" +TOKEN="${REGISTRY_PACKAGE_TOKEN:-}" REGISTRY_IMAGE="${REGISTRY_IMAGE:-${IMAGE:-}}" DEPLOY_ENV="${DEPLOY_ENV:-}" CURRENT_IMAGE_TAG="${IMAGE_VERSION_TAG:-}" -if [ -z "$TOKEN" ] && [ -z "${GITEA_PACKAGE_VERSIONS_FILE:-}" ]; then - echo "Missing GITEA_PACKAGE_TOKEN" >&2 +if [ -z "$TOKEN" ] && [ -z "${REGISTRY_PACKAGE_VERSIONS_FILE:-}" ]; then + echo "Missing REGISTRY_PACKAGE_TOKEN" >&2 exit 1 fi @@ -64,8 +64,8 @@ cleanup() { } trap cleanup EXIT -if [ -n "${GITEA_PACKAGE_VERSIONS_FILE:-}" ]; then - cp "$GITEA_PACKAGE_VERSIONS_FILE" "$versions_json" +if [ -n "${REGISTRY_PACKAGE_VERSIONS_FILE:-}" ]; then + cp "$REGISTRY_PACKAGE_VERSIONS_FILE" "$versions_json" else curl -fsS \ -H "Authorization: token $TOKEN" \