Enhance image builds and monitoring with no-cache and cleanup (#3344)

* Use CCS tag for mainland pushes

* Add no-cache support to image builds

* Revamp rollout checksums for env and image changes

* Add root build wrapper for image and package builds

* Sync monitoring defaults and env generation

* Harden monitoring deploy and uninstall cleanup

* Unify monitoring provider handling in deploy scripts

* Clean up stale monitoring services during deployment

* Restrict monitoring dashboard to superusers

* Restrict monitoring dashboard to superusers

* Relocate monitoring env files to deploy/env

* Unify monitoring env handling for deploys

* Show image tag examples in deployment source selector

* 同步修改文档

* Refactor agent generation workflow

* Add interactive deploy config mode

* Enable default config mode in offline deploy wrapper

* Stop persisting appVersion in deployment config

* Add defaults mode to deploy wrappers

---------

Co-authored-by: root <root@DESKTOP-UARO3HF.localdomain>
Co-authored-by: hhhhsc <name>

Author: hhhhsc701

.dockerignore

@@ -62,4 +62,4 @@ assets/
 .Spotlight-V100
 .Trashes
 ehthumbs.db
-Thumbs.db 
+Thumbs.db

.gitignore

@@ -20,7 +20,7 @@ docker/openssh-server
 docker/volumes/db/data
 docker/.env
 docker/.env.generated
-deploy/docker/assets/monitoring/monitoring.env
+deploy/env/monitoring.env
 docker/.run
 docker/deploy.options
 k8s/helm/deploy.options
@@ -84,4 +84,4 @@ _doc/
 /deploy/env/.env
 /deploy/env/.env.bak
 
-agent_repository_frontend
+agent_repository_frontend

README.md

@@ -50,13 +50,13 @@ cd nexent
 bash deploy.sh docker
 ```
 
-The root `deploy.sh` only forwards to the target deploy script; the native Docker implementation is `bash deploy/docker/deploy.sh`. The Docker and Kubernetes deploy scripts share the same deployment configuration model. Interactive runs show Bash TUI menus for component selection, port policy, and image source. `infrastructure` is required; `application`, `data-process`, and `supabase` are selected by default and can be disabled when you want a smaller deployment. Use `b`/Backspace to return to the previous TUI step and `q` to quit. Non-interactive runs can pass the same choices with `--version`, `--components`, `--port-policy development|production`, and `--image-source general|mainland|local-latest`. Successful deployments save non-sensitive choices to each deploy directory's `deploy.options` for reuse on the next run.
+The root `deploy.sh` only forwards to the target deploy script; the native Docker implementation is `bash deploy/docker/deploy.sh`. The Docker and Kubernetes deploy scripts share the same deployment configuration model. Interactive runs show Bash TUI menus for component selection, port policy, and image source. `infrastructure` is required; `application`, `data-process`, and `supabase` are selected by default and can be disabled when you want a smaller deployment. Use `b`/Backspace to return to the previous TUI step and `q` to quit. Use `--defaults` to skip the TUI and deploy with saved `deploy.options` or built-in defaults. Non-interactive runs can also pass the same choices with `--version`, `--components`, `--port-policy development|production`, and `--image-source general|mainland|local-latest`. Successful deployments save non-sensitive choices to each deploy directory's `deploy.options` for reuse on the next run.
 
-Docker and Kubernetes both use `deploy/env/.env` as the runtime configuration file. Existing `deploy/env/.env` is kept as-is. If it does not exist, the deploy scripts first reuse `docker/.env`, then fall back to `deploy/env/.env.example`.
+Docker and Kubernetes both use `deploy/env/.env` as the runtime configuration file. Existing `deploy/env/.env` is kept as-is. If it does not exist, the deploy scripts first reuse `docker/.env`, then fall back to `deploy/env/.env.example`. Monitoring-specific settings are generated from `deploy/env/monitoring.env.example` into `deploy/env/monitoring.env`.
 
 Docker uninstall is handled by `bash uninstall.sh docker`. It can preserve or delete data volumes: run it interactively, pass `--delete-volumes true|false`, or use `bash uninstall.sh docker delete-all` to remove containers and persistent data.
 
-Offline image packages can be built with `bash deploy/offline/build_offline_package.sh --target docker --compress true`. The package includes image tar files, `load-images.sh`, root deploy/uninstall entrypoints, deployment scripts, SQL files, `manifest.yaml`, and `checksums.txt`; deploy it with `bash deploy.sh --load-images docker ...` on the target host.
+Offline image packages can be built with `bash build.sh --package --target docker --compress true` or `bash deploy/offline/build_offline_package.sh --target docker --compress true`. The package includes image tar files, `load-images.sh`, root deploy/uninstall entrypoints, deployment scripts, SQL files, `manifest.yaml`, and `checksums.txt`. Package deploys use saved `deploy.options` or built-in defaults without opening the TUI; add `--config` to configure interactively. Deploy with `bash deploy.sh --load-images docker ...` on the target host.
 
 For detailed deployment instructions, see [Docker Installation](https://modelengine-group.github.io/nexent/en/quick-start/installation.html).
 

README_CN.md

@@ -50,13 +50,13 @@ cd nexent
 bash deploy.sh docker
 ```
 
-根目录 `deploy.sh` 只负责转发到目标部署脚本；Docker 真实实现为 `bash deploy/docker/deploy.sh`。Docker 和 Kubernetes 使用同一套部署配置模型；交互式运行会通过 Bash TUI 选择组件、端口策略和镜像源。`infrastructure` 必选，`application`、`data-process`、`supabase` 默认选中，也可以取消以部署更小的组合。非交互部署可传入 `--version`、`--components`、`--port-policy development|production`、`--image-source general|mainland|local-latest`。
+根目录 `deploy.sh` 只负责转发到目标部署脚本；Docker 真实实现为 `bash deploy/docker/deploy.sh`。Docker 和 Kubernetes 使用同一套部署配置模型；交互式运行会通过 Bash TUI 选择组件、端口策略和镜像源。`infrastructure` 必选，`application`、`data-process`、`supabase` 默认选中，也可以取消以部署更小的组合。使用 `--defaults` 可跳过 TUI，并复用已保存的 `deploy.options` 或内置默认值。非交互部署也可传入 `--version`、`--components`、`--port-policy development|production`、`--image-source general|mainland|local-latest`。
 
-Docker 与 Kubernetes 统一使用 `deploy/env/.env` 作为运行配置文件；已有 `deploy/env/.env` 会原样保留。如果 `deploy/env/.env` 不存在，部署脚本会优先复用已有的 `docker/.env`，再回退到 `deploy/env/.env.example`。
+Docker 与 Kubernetes 统一使用 `deploy/env/.env` 作为运行配置文件；已有 `deploy/env/.env` 会原样保留。如果 `deploy/env/.env` 不存在，部署脚本会优先复用已有的 `docker/.env`，再回退到 `deploy/env/.env.example`。监控相关配置会从 `deploy/env/monitoring.env.example` 生成到 `deploy/env/monitoring.env`。
 
 Docker 卸载入口为 `bash uninstall.sh docker`，默认交互确认是否删除持久化数据；也可以通过 `--delete-volumes true|false` 控制，或使用 `bash uninstall.sh docker delete-all` 同时删除容器和持久化数据。
 
-离线镜像包可通过 `bash deploy/offline/build_offline_package.sh --target docker --compress true` 构建。包内包含镜像 tar、`load-images.sh`、根目录部署/卸载入口、部署脚本、SQL 文件、`manifest.yaml` 和 `checksums.txt`；在目标机器上使用 `bash deploy.sh --load-images docker ...` 加载镜像并部署。
+离线镜像包可通过 `bash build.sh --package --target docker --compress true` 或 `bash deploy/offline/build_offline_package.sh --target docker --compress true` 构建。包内包含镜像 tar、`load-images.sh`、根目录部署/卸载入口、部署脚本、SQL 文件、`manifest.yaml` 和 `checksums.txt`。包内部署会复用已保存的 `deploy.options` 或内置默认值，默认不进入 TUI；添加 `--config` 可交互配置。在目标机器上使用 `bash deploy.sh --load-images docker ...` 加载镜像并部署。
 
 详细部署指南请参考 [Docker 安装部署](https://modelengine-group.github.io/nexent/zh/quick-start/installation.html)。
 

build.sh

@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DEPLOYMENT_COMMON="$SCRIPT_DIR/deploy/common/common.sh"
+
+if [ -f "$DEPLOYMENT_COMMON" ]; then
+  # shellcheck source=/dev/null
+  source "$DEPLOYMENT_COMMON"
+fi
+[ -n "${DEPLOYMENT_LANGUAGE:-}" ] || DEPLOYMENT_LANGUAGE="en"
+
+usage() {
+  if [ "$DEPLOYMENT_LANGUAGE" = "zh" ]; then
+    cat <<'USAGE'
+用法：
+  bash build.sh [镜像构建选项]
+  bash build.sh --package [离线包构建选项]
+
+镜像构建会转发到：deploy/images/build.sh
+离线包构建会转发到：deploy/offline/build_offline_package.sh
+
+常用示例：
+  bash build.sh --main --version latest --dry-run
+  bash build.sh --package --version latest --target docker --dry-run
+
+更多选项：
+  bash deploy/images/build.sh --help
+  bash deploy/offline/build_offline_package.sh --help
+USAGE
+    return
+  fi
+
+  cat <<'USAGE'
+Usage:
+  bash build.sh [image build options]
+  bash build.sh --package [offline package options]
+
+Image builds are forwarded to: deploy/images/build.sh
+Offline package builds are forwarded to: deploy/offline/build_offline_package.sh
+
+Examples:
+  bash build.sh --main --version latest --dry-run
+  bash build.sh --package --version latest --target docker --dry-run
+
+More options:
+  bash deploy/images/build.sh --help
+  bash deploy/offline/build_offline_package.sh --help
+USAGE
+}
+
+case "${1:-}" in
+  --help|-h)
+    usage
+    exit 0
+    ;;
+esac
+
+if [ "${1:-}" = "--package" ]; then
+  shift
+  exec bash "$SCRIPT_DIR/deploy/offline/build_offline_package.sh" "$@"
+fi
+
+exec bash "$SCRIPT_DIR/deploy/images/build.sh" "$@"

deploy.sh

@@ -3,19 +3,73 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+DEPLOYMENT_COMMON="$SCRIPT_DIR/deploy/common/common.sh"
+
+if [ -f "$DEPLOYMENT_COMMON" ]; then
+  # shellcheck source=/dev/null
+  source "$DEPLOYMENT_COMMON"
+fi
+[ -n "${DEPLOYMENT_LANGUAGE:-}" ] || DEPLOYMENT_LANGUAGE="en"
+DEPLOY_WRAPPER_DEFAULT_CONFIG_MODE=""
 
 usage() {
+  if [ "$DEPLOYMENT_LANGUAGE" = "zh" ]; then
+    cat <<'USAGE'
+用法：
+  bash deploy.sh [--load-images] [--config|--defaults] docker [Docker 部署选项]
+  bash deploy.sh [--load-images] [--config|--defaults] k8s [K8s 部署选项]
+
+USAGE
+    if [ "$DEPLOY_WRAPPER_DEFAULT_CONFIG_MODE" = "defaults" ]; then
+      cat <<'USAGE'
+此离线包入口默认复用保存配置或内置默认值部署，不进入交互界面。
+添加 --config 可进入交互式部署配置界面。
+实现：deploy/deploy.sh
+
+USAGE
+    else
+      cat <<'USAGE'
+此根入口只转发到目标专用部署脚本。
+实现：deploy/deploy.sh
+
+USAGE
+    fi
+    cat <<'USAGE'
+选项：
+  --load-images    部署前从 ./images 加载 Docker 镜像 tar 文件。
+                   默认关闭。
+  --config         进入交互式部署配置界面。
+  --defaults       复用保存配置或内置默认值，跳过交互界面。
+USAGE
+    return
+  fi
+
   cat <<'USAGE'
 Usage:
-  bash deploy.sh [--load-images] docker [docker deploy options]
-  bash deploy.sh [--load-images] k8s [k8s deploy options]
+  bash deploy.sh [--load-images] [--config|--defaults] docker [docker deploy options]
+  bash deploy.sh [--load-images] [--config|--defaults] k8s [k8s deploy options]
+
+USAGE
+  if [ "$DEPLOY_WRAPPER_DEFAULT_CONFIG_MODE" = "defaults" ]; then
+    cat <<'USAGE'
+This offline entrypoint deploys with saved configuration or built-in defaults by default.
+Add --config to open the interactive deployment configuration.
+Implementation: deploy/deploy.sh
 
+USAGE
+  else
+    cat <<'USAGE'
 This root entrypoint only forwards to the target-specific deploy script.
 Implementation: deploy/deploy.sh
 
+USAGE
+  fi
+  cat <<'USAGE'
 Options:
   --load-images    Load Docker image tar files from ./images before deploying.
                    Defaults to off.
+  --config         Open the interactive deployment configuration.
+  --defaults       Use saved configuration or built-in defaults and skip TUI.
 USAGE
 }
 
@@ -25,6 +79,7 @@ if [ "${1:-}" = "--help" ] || [ "${1:-}" = "-h" ] || [ $# -eq 0 ]; then
 fi
 
 LOAD_IMAGES="false"
+DEPLOY_CONFIG_MODE="$DEPLOY_WRAPPER_DEFAULT_CONFIG_MODE"
 FORWARD_ARGS=()
 
 while [ $# -gt 0 ]; do
@@ -33,6 +88,14 @@ while [ $# -gt 0 ]; do
       LOAD_IMAGES="true"
       shift
       ;;
+    --config)
+      DEPLOY_CONFIG_MODE="tui"
+      shift
+      ;;
+    --defaults)
+      DEPLOY_CONFIG_MODE="defaults"
+      shift
+      ;;
     *)
       FORWARD_ARGS+=("$1")
       shift
@@ -48,10 +111,18 @@ fi
 if [ "$LOAD_IMAGES" = "true" ]; then
   LOAD_SCRIPT="$SCRIPT_DIR/load-images.sh"
   if [ ! -f "$LOAD_SCRIPT" ]; then
-    echo "Error: --load-images requires $LOAD_SCRIPT" >&2
+    if [ "$DEPLOYMENT_LANGUAGE" = "zh" ]; then
+      echo "错误：--load-images 需要 $LOAD_SCRIPT" >&2
+    else
+      echo "Error: --load-images requires $LOAD_SCRIPT" >&2
+    fi
     exit 1
   fi
   bash "$LOAD_SCRIPT"
 fi
 
+if [ -n "$DEPLOY_CONFIG_MODE" ]; then
+  NEXENT_DEPLOY_CONFIG_MODE="$DEPLOY_CONFIG_MODE" exec bash "$SCRIPT_DIR/deploy/deploy.sh" "${FORWARD_ARGS[@]}"
+fi
+
 exec bash "$SCRIPT_DIR/deploy/deploy.sh" "${FORWARD_ARGS[@]}"