feat: 合并 Docker Compose、标注表格优化与部署文档
将 platform + CVAT 合并为单文件 docker-compose.yml,完善 .env 与 init/dev_up 脚本; 新增 docs/DEPLOY.md 与更新 README 以支持新机器部署;含数据湖示例、车队地图、 紧凑表格 UI、ADAS det_7cls 路径与批次台账等近期改动。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -4,23 +4,41 @@ set -euo pipefail
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
cd "$ROOT"
|
||||
|
||||
COMPOSE_FILES=(-f docker-compose.yml -f docker-compose.cvat.yml)
|
||||
|
||||
if [[ ! -f .env ]]; then
|
||||
cp .env.example .env
|
||||
echo "已创建 .env(默认挂载本仓库;大文件数据可设置 AS_WORKSPACE_ROOT)"
|
||||
echo "已创建 .env(请按部署机器修改 AS_WORKSPACE_ROOT / AS_DATA_LAKE_HOST / AS_FRONTEND_URL)"
|
||||
fi
|
||||
|
||||
DEFAULT_WS="$(cd "$ROOT/.." && pwd)/workspace"
|
||||
if [[ -d "$DEFAULT_WS/DMS" ]] && ! grep -q '^AS_WORKSPACE_ROOT=' .env 2>/dev/null; then
|
||||
echo "AS_WORKSPACE_ROOT=$DEFAULT_WS" >> .env
|
||||
echo "已写入 AS_WORKSPACE_ROOT=$DEFAULT_WS"
|
||||
fi
|
||||
|
||||
if ! grep -q '^CVAT_HOST=' .env 2>/dev/null; then
|
||||
echo "CVAT_HOST=http://hsap-cvat-server:8080" >> .env
|
||||
DEFAULT_DATA="$(cd "$ROOT/.." && pwd)/data"
|
||||
if [[ -d "$DEFAULT_DATA" ]] && ! grep -q '^AS_DATA_LAKE_HOST=' .env 2>/dev/null; then
|
||||
echo "AS_DATA_LAKE_HOST=$DEFAULT_DATA" >> .env
|
||||
echo "已写入 AS_DATA_LAKE_HOST=$DEFAULT_DATA"
|
||||
fi
|
||||
if ! grep -q '^CVAT_PUBLIC_URL=' .env 2>/dev/null; then
|
||||
echo "CVAT_PUBLIC_URL=http://127.0.0.1:8080" >> .env
|
||||
|
||||
for key_val in \
|
||||
"CVAT_HOST=http://hsap-cvat-server:8080" \
|
||||
"CVAT_PUBLIC_URL=http://127.0.0.1:8080" \
|
||||
"CVAT_PORT=8080"; do
|
||||
key="${key_val%%=*}"
|
||||
if ! grep -q "^${key}=" .env 2>/dev/null; then
|
||||
echo "$key_val" >> .env
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ ! -f manifests/feishu.env ]]; then
|
||||
cp manifests/feishu.env.example manifests/feishu.env
|
||||
echo "已创建 manifests/feishu.env"
|
||||
fi
|
||||
|
||||
if [[ ! -f platform/ui-hsap/dist/index.html ]]; then
|
||||
echo "首次启动:构建前端静态包…"
|
||||
bash scripts/build_web.sh
|
||||
fi
|
||||
|
||||
if ! command -v docker >/dev/null 2>&1; then
|
||||
@@ -28,15 +46,17 @@ if ! command -v docker >/dev/null 2>&1; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
docker compose "${COMPOSE_FILES[@]}" up -d --build "$@"
|
||||
# shellcheck disable=SC1091
|
||||
[[ -f .env ]] && set -a && source .env && set +a
|
||||
|
||||
docker compose up -d --build "$@"
|
||||
|
||||
echo ""
|
||||
echo "服务:"
|
||||
echo " HSAP 平台 http://127.0.0.1:${AS_PLATFORM_PORT:-8787}"
|
||||
echo " CVAT 标注画布 http://127.0.0.1:${CVAT_PORT:-8080} (由 HSAP 嵌入,无需单独登录)"
|
||||
echo " PostgreSQL localhost:${AS_DB_PORT:-5432}"
|
||||
echo " Redis localhost:${AS_REDIS_PORT:-6379}"
|
||||
echo " HSAP 平台 ${AS_FRONTEND_URL:-http://127.0.0.1:8787}"
|
||||
echo " CVAT 标注画布 ${CVAT_PUBLIC_URL:-http://127.0.0.1:8080} (由 HSAP 嵌入,无需单独登录)"
|
||||
echo " PostgreSQL localhost:${AS_DB_PORT:-5433}"
|
||||
echo " Redis localhost:${AS_REDIS_PORT:-6380}"
|
||||
echo ""
|
||||
echo "React 热更新: docker compose --profile dev up -d web-dev → :5173"
|
||||
echo "日志: docker compose ${COMPOSE_FILES[*]} logs -f platform worker cvat_server"
|
||||
echo "停止: docker compose ${COMPOSE_FILES[*]} down"
|
||||
echo "日志: docker compose logs -f platform worker cvat_server"
|
||||
echo "停止: docker compose down"
|
||||
|
||||
Reference in New Issue
Block a user