build(deploy): 优化 uv 安装与部署并发保护
This commit is contained in:
@@ -56,6 +56,56 @@ stop_legacy_containers() {
|
||||
done
|
||||
}
|
||||
|
||||
# 同一台机器只允许一个部署任务构建/重建,避免两个 deploy.sh 抢缓存和互相覆盖。
|
||||
acquire_deploy_lock() {
|
||||
local lock_file="${DEPLOY_LOCK_FILE:-/tmp/live-hub-py-deploy.lock}"
|
||||
if ! command -v flock >/dev/null 2>&1; then
|
||||
echo "⚠️ 未安装 flock,跳过部署并发锁"
|
||||
return 0
|
||||
fi
|
||||
exec 9>"$lock_file"
|
||||
if ! flock -n 9; then
|
||||
echo "❌ 已有部署任务在运行(锁: $lock_file),请稍后再试"
|
||||
exit 1
|
||||
fi
|
||||
echo " 已获取部署锁: $lock_file"
|
||||
}
|
||||
|
||||
# 给镜像构建加超时,避免网络卡住时脚本无限挂起。
|
||||
build_app_image() {
|
||||
local build_timeout="${DEPLOY_BUILD_TIMEOUT:-1800}"
|
||||
echo " 构建超时: ${build_timeout}s"
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
timeout "$build_timeout" $COMPOSE build douyu-login || {
|
||||
local code=$?
|
||||
echo "❌ 镜像构建失败或超过 ${build_timeout}s(退出码 ${code})"
|
||||
exit "$code"
|
||||
}
|
||||
else
|
||||
$COMPOSE build douyu-login
|
||||
fi
|
||||
}
|
||||
|
||||
# 等待 Docker 自身 HEALTHCHECK 通过(同时覆盖 Web 和同容器 Worker)。
|
||||
wait_for_container_healthy() {
|
||||
local cid status
|
||||
cid="$($COMPOSE ps -q douyu-login 2>/dev/null | head -n 1)"
|
||||
if [ -z "$cid" ]; then
|
||||
return 1
|
||||
fi
|
||||
for _ in $(seq 1 60); do
|
||||
status="$(docker inspect -f '{{if .State.Health}}{{.State.Health.Status}}{{else}}{{.State.Status}}{{end}}' "$cid" 2>/dev/null || true)"
|
||||
if [ "$status" = "healthy" ]; then
|
||||
return 0
|
||||
fi
|
||||
if [ "$status" = "unhealthy" ]; then
|
||||
return 1
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# ── 子命令 ──────────────────────────────────────────────
|
||||
|
||||
cmd_deploy() {
|
||||
@@ -64,6 +114,8 @@ cmd_deploy() {
|
||||
echo " 斗鱼批量登录 - Docker 部署"
|
||||
echo "=============================="
|
||||
|
||||
acquire_deploy_lock
|
||||
|
||||
if ! command -v docker &> /dev/null; then
|
||||
echo "❌ 未安装 Docker,请先安装:"
|
||||
echo " curl -fsSL https://get.docker.com | sh"
|
||||
@@ -93,10 +145,10 @@ cmd_deploy() {
|
||||
mkdir -p data logs
|
||||
|
||||
# 构建并启动
|
||||
echo "正在构建应用镜像(首次构建约3-5分钟)..."
|
||||
echo "正在构建应用镜像(首次构建可能较久;有缓存时通常几十秒)..."
|
||||
stop_legacy_containers
|
||||
# 生产部署不构建含大型开发依赖的 test 镜像;测试镜像仅在本地按需构建。
|
||||
$COMPOSE build douyu-login
|
||||
build_app_image
|
||||
|
||||
echo ""
|
||||
echo "正在启动服务..."
|
||||
@@ -113,11 +165,20 @@ cmd_deploy() {
|
||||
# 30 秒不够:mysql 一起重建时应用就绪约 35 秒,会误报「启动超时」。
|
||||
for i in $(seq 1 40); do
|
||||
if curl -s "http://localhost:${APP_PORT}/api/health" | grep -q "ok" 2>/dev/null; then
|
||||
echo ""
|
||||
echo "服务已响应,等待 Docker 健康检查..."
|
||||
if ! wait_for_container_healthy; then
|
||||
echo "❌ 服务已响应,但容器未进入 healthy 状态,查看日志:"
|
||||
$COMPOSE ps
|
||||
$COMPOSE logs --tail 50 douyu-login
|
||||
exit 1
|
||||
fi
|
||||
echo ""
|
||||
echo "=============================="
|
||||
echo " ✅ 部署成功!"
|
||||
echo "=============================="
|
||||
echo " 访问地址: http://localhost:${APP_PORT}"
|
||||
echo " 容器健康: healthy"
|
||||
echo " 默认账号见环境变量 ADMIN_USERNAME/ADMIN_PASSWORD(未设置则为 admin/admin123)"
|
||||
echo ""
|
||||
echo " 查看应用日志: ./deploy.sh logs"
|
||||
|
||||
Reference in New Issue
Block a user