feat(ldap): Active Directory 双目录支持与 Docker 构建优化
- 新增 ldap_ad.go,支持 AD 密码编码、字段映射与目录类型判断 - 重构 ldap/ldap_users/ldap_ou,兼容 OpenLDAP 与 AD 登录、导入、OU 浏览 - 前端系统设置增加目录类型选择与 AD 配置项 - Dockerfile 按 TARGETARCH 单架构编译 Agent,限制 Node 内存防 OOM - run.sh 新增 docker fast/upgrade,README 补充 LDAP/AD 与常见问题
This commit is contained in:
1 parent
0f0f2770e1
commit
78c27037e3
12 files changed
+613
-226
No files matched your search
@@ -754,20 +754,20 @@ cmd_docker() {
|
||||
case "$action" in
|
||||
up|upgrade|update)
|
||||
banner "========== Docker Compose 启动/升级 ($BUILD_VERSION) =========="
|
||||
clean_all_artifacts
|
||||
# Docker 在容器内构建,无需清理宿主机产物;每次 prune 缓存会导致下次全量编译 // Logan.Li
|
||||
if [ "$fresh_build" -eq 1 ]; then
|
||||
info "全量重建镜像 (--no-cache)..."
|
||||
$DOCKER_COMPOSE build --no-cache
|
||||
$DOCKER_COMPOSE build --no-cache aiops
|
||||
$DOCKER_COMPOSE up -d --force-recreate --remove-orphans
|
||||
elif [ "$action" = "upgrade" ] || [ "$action" = "update" ]; then
|
||||
info "升级应用:仅重建 aiops 容器..."
|
||||
$DOCKER_COMPOSE build aiops
|
||||
$DOCKER_COMPOSE up -d --force-recreate --no-deps aiops
|
||||
else
|
||||
info "增量构建 + 强制重建容器..."
|
||||
$DOCKER_COMPOSE up -d --build --force-recreate --remove-orphans
|
||||
info "增量构建 + 启动容器(保留 BuildKit 缓存)..."
|
||||
$DOCKER_COMPOSE up -d --build --remove-orphans
|
||||
fi
|
||||
echo ""
|
||||
info "清理历史构建缓存..."
|
||||
docker builder prune -f 2>/dev/null || true
|
||||
docker image prune -f 2>/dev/null || true
|
||||
echo ""
|
||||
info "等待服务就绪..."
|
||||
sleep 5
|
||||
$DOCKER_COMPOSE ps
|
||||
@@ -818,12 +818,20 @@ cmd_docker() {
|
||||
echo " $(df -h / | awk 'NR==2{print $3, "used /", $2, "total ("$5")"}')"
|
||||
success "清理完成"
|
||||
;;
|
||||
fast|start)
|
||||
banner "========== Docker Compose 快速启动 (不构建镜像) =========="
|
||||
$DOCKER_COMPOSE up -d --remove-orphans
|
||||
sleep 3
|
||||
$DOCKER_COMPOSE ps
|
||||
info "访问地址: http://localhost:8080"
|
||||
;;
|
||||
fresh)
|
||||
cmd_docker up fresh
|
||||
;;
|
||||
help|--help|-h)
|
||||
echo "Docker Compose 部署命令 (embed 单容器 + MySQL + Redis):"
|
||||
echo " ./run.sh docker up 增量构建 + 启动"
|
||||
echo " ./run.sh docker fast 跳过构建,直接启动(低负载)"
|
||||
echo " ./run.sh docker up v1.0.1 指定版本构建"
|
||||
echo " ./run.sh docker up fresh 无缓存全量重建"
|
||||
echo " ./run.sh docker push v1.0.1 构建并推送到 $DOCKERHUB_IMAGE"
|
||||
|
||||
Reference in new issue
Block a user