From 93d11d00a22662920262755f7e59d842f65e9cb1 Mon Sep 17 00:00:00 2001 From: lxh2875931338 Date: Wed, 29 Jul 2026 23:51:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8test=E5=88=86=E6=94=AF=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=B5=8B=E8=AF=95=E4=B9=8B=E5=89=8D=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC=E4=BC=9A=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E5=88=B0=E5=8E=9F=E6=9C=89=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy.sh | 410 +++++++++--------------------------------------------- 1 file changed, 66 insertions(+), 344 deletions(-) diff --git a/deploy.sh b/deploy.sh index cbf1f6b..b34e82c 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,10 +1,15 @@ #!/bin/bash # ============================================================ -# frpc-console 一键部署脚本 (Docker 优先) +# frpc-console 一键部署脚本(Docker 优先) +# 支持:Linux x86_64 / ARM64 / ARMv7 +# 自动安装:git / curl / wget / Docker +# # 用法: -# curl -sSL .../deploy.sh | sudo bash -# curl -sSL .../deploy.sh | sudo bash -s -- --channel preview +# ./deploy.sh # 完整交互流程 +# ./deploy.sh --yes # 跳过确认,直接执行 +# ./deploy.sh --check # 只检测环境,不执行 +# ./deploy.sh --dry-run # 显示将执行的操作,不实际执行 # ============================================================ set -e @@ -19,7 +24,13 @@ if [ -t 1 ]; then MAGENTA='\033[0;35m' NC='\033[0m' else - RED=''; GREEN=''; YELLOW=''; BLUE=''; CYAN=''; MAGENTA=''; NC='' + RED='' + GREEN='' + YELLOW='' + BLUE='' + CYAN='' + MAGENTA='' + NC='' fi # ---------- 配置 ---------- @@ -49,10 +60,6 @@ CONTAINER_RUNNING=false SKIP_CONFIRM=false CHECK_ONLY=false DRY_RUN=false -CHANNEL="" -CURRENT_VERSION="" -TARGET_VERSION="" -IMAGE_TAG="" # ---------- 打印函数 ---------- print_info() { echo -e "${BLUE}[INFO]${NC} $1"; } @@ -67,38 +74,22 @@ print_subtitle() { echo -e "${MAGENTA} $1${NC}"; } parse_args() { for arg in "$@"; do case $arg in - --yes|-y) - SKIP_CONFIRM=true - ;; - --check) - CHECK_ONLY=true - ;; - --dry-run) - DRY_RUN=true - ;; - --channel) - shift - CHANNEL="$1" - ;; - --channel=*) - CHANNEL="${arg#*=}" - ;; + --yes|-y) SKIP_CONFIRM=true ;; + --check) CHECK_ONLY=true ;; + --dry-run) DRY_RUN=true ;; --help|-h) echo "用法: ./deploy.sh [选项]" echo "" echo "选项:" - echo " --channel lts 使用 LTS 通道 (main 分支)" - echo " --channel preview 使用 Preview 通道 (test 分支)" - echo " --yes, -y 跳过所有确认提示" - echo " --check 只检测环境,不执行部署" - echo " --dry-run 显示将执行的操作,不实际执行" - echo " --help, -h 显示帮助信息" + echo " --yes, -y 跳过所有确认提示,直接执行" + echo " --check 只检测环境,不执行部署" + echo " --dry-run 显示将执行的操作,不实际执行" + echo " --help, -h 显示帮助信息" echo "" echo "示例:" - echo " ./deploy.sh # 交互式选择通道" - echo " ./deploy.sh --channel lts # 部署 LTS 版本" - echo " ./deploy.sh --channel preview # 部署 Preview 版本" - echo " ./deploy.sh --yes # 无人值守部署" + echo " ./deploy.sh # 完整交互流程" + echo " ./deploy.sh --yes # 无人值守部署" + echo " ./deploy.sh --check # 只检测环境" exit 0 ;; *) @@ -163,178 +154,14 @@ check_container() { fi } -# ---------- 版本管理函数 ---------- - -# 直接从远程仓库读取 version.ini -read_version_from_remote() { - local branch="$1" - local version_url="https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/${branch}/version.ini" - - local content - content=$(curl -sSL "$version_url" 2>/dev/null) - if [ -z "$content" ]; then - print_error "无法从远程读取 version.ini: $version_url" - return 1 - fi - - SEMVER=$(echo "$content" | grep -v "^[;#]" | head -1 | awk '{print $1}') - LTS_DATE=$(echo "$content" | grep -v "^[;#]" | head -1 | awk '{print $2}') - echo "$SEMVER $LTS_DATE" -} - -get_version_type() { - local semver="$1" - local minor="${semver#*.}" - if [ "$minor" = "0" ] || [ "$minor" = "5" ]; then - echo "lts" - else - echo "preview" - fi -} - -generate_target_version() { - local channel="$1" - local branch="${2:-$BRANCH}" - - local semver_lts_date - semver_lts_date=$(read_version_from_remote "$branch") - if [ $? -ne 0 ] || [ -z "$semver_lts_date" ]; then - print_error "读取版本信息失败" - exit 1 - fi - - SEMVER=$(echo "$semver_lts_date" | awk '{print $1}') - LTS_DATE=$(echo "$semver_lts_date" | awk '{print $2}') - - if [ -z "$SEMVER" ]; then - print_error "无法从 version.ini 读取语义版本" - exit 1 - fi - - local vtype - vtype=$(get_version_type "$SEMVER") - - if [ "$channel" = "lts" ] || [ "$vtype" = "lts" ]; then - if [ -z "$LTS_DATE" ]; then - LTS_DATE=$(date +%Y%m%d) - print_warn "LTS 版本未指定日期,使用今天: $LTS_DATE" - fi - TARGET_VERSION="${SEMVER}-lts-${LTS_DATE}" - IMAGE_TAG="${SEMVER}-lts-${LTS_DATE}" - else - TIMESTAMP=$(date +%Y%m%d-%H%M%S) - TARGET_VERSION="${SEMVER}-preview-${TIMESTAMP}" - IMAGE_TAG="preview-${TIMESTAMP}" - fi - echo "$TARGET_VERSION $IMAGE_TAG" -} - -get_current_version() { - local version_file="${DEPLOY_DIR}/version.ini" - if [ -f "$version_file" ]; then - grep -v "^[;#]" "$version_file" | head -1 | tr -d '\n' - else - if [ "$CONTAINER_EXISTS" = true ]; then - docker exec frpc-console cat /app/version.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo "0.0.0-dev" - else - echo "0.0.0-dev" - fi - fi -} - -extract_semver() { - local version="$1" - echo "$version" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/' -} - -extract_timestamp() { - local version="$1" - echo "$version" | sed -E 's/^[0-9]+\.[0-9]+-(lts|preview)-//' -} - -compare_version() { - local current="$1" - local target="$2" - - local cur_semver=$(extract_semver "$current") - local tgt_semver=$(extract_semver "$target") - - if [ "$tgt_semver" -gt "$cur_semver" ] 2>/dev/null; then - return 1 - fi - if [ "$tgt_semver" -lt "$cur_semver" ] 2>/dev/null; then - return 2 - fi - - local cur_ts=$(extract_timestamp "$current") - local tgt_ts=$(extract_timestamp "$target") - - if [ -z "$cur_ts" ]; then - cur_ts="0" - fi - if [ -z "$tgt_ts" ]; then - tgt_ts="0" - fi - - if [ "$tgt_ts" -gt "$cur_ts" ] 2>/dev/null; then - return 1 - elif [ "$tgt_ts" -eq "$cur_ts" ] 2>/dev/null; then - return 0 - else - return 2 - fi -} - -# ---------- 通道选择(含分支切换)---------- -select_channel() { - if [ -n "$CHANNEL" ]; then - if [ "$CHANNEL" != "lts" ] && [ "$CHANNEL" != "preview" ]; then - print_error "无效通道: $CHANNEL (仅支持 lts / preview)" - exit 1 - fi - if [ "$CHANNEL" = "preview" ]; then - BRANCH="test" - else - BRANCH="main" - fi - print_info "使用命令行参数: ${CHANNEL} 通道 (${BRANCH} 分支)" - return - fi - - echo "" - echo -e "${CYAN}请选择部署通道:${NC}" - echo " 1. LTS (稳定版,生产推荐) [默认] → main 分支" - echo " 2. Preview (技术预览版,包含新特性) → test 分支" - echo "" - read -p "请选择 [1]: " CHANNEL_INPUT /dev/null; then + if ! sqlite3 "$DB_FILE" "SELECT COUNT(*) FROM sqlite_master WHERE type='table' AND name='users';" 2>/dev/null | grep -q "^1$"; then + print_warn "数据库文件无效,将删除,由容器全新初始化" + rm -f "$DB_FILE" else - print_warn "部署目录不存在,跳过备份" + print_info "数据库有效,保留" fi + else + print_warn "sqlite3 未安装,无法检查数据库有效性,保留原文件" fi else - print_info "首次部署,跳过版本比对" + print_info "数据库文件不存在,跳过备份" fi - # ----- 安装必要工具(必须在拉取代码之前!)----- - if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then - print_step "安装必要工具..." - local pkgs="" - [ "$NEED_INSTALL_GIT" = true ] && pkgs="${pkgs} git" - [ "$NEED_INSTALL_CURL" = true ] && pkgs="${pkgs} curl" - [ "$NEED_INSTALL_WGET" = true ] && pkgs="${pkgs} wget" - - case $OS in - opensuse*|suse*|opensuse-tumbleweed|opensuse-slowroll|opensuse-leap) - if [ "$NEED_INSTALL_GIT" = true ]; then - zypper install -y git-core - pkgs=$(echo "$pkgs" | sed -E 's/(^| )git( |$)/ /g' | sed 's/ */ /g' | sed 's/^ //;s/ $//') - fi - if [ -n "$pkgs" ]; then - zypper install -y $pkgs - fi - ;; - ubuntu|debian|linuxmint) - apt update -qq && apt install -y $pkgs - ;; - centos|rhel|fedora|rocky|almalinux) - yum install -y $pkgs - ;; - alpine) - apk add $pkgs - ;; - arch|manjaro|endeavouros) - pacman -S --needed --noconfirm $pkgs - ;; - *) - print_error "无法识别包管理器,请手动安装: $pkgs" - exit 1 - ;; - esac - print_success "必要工具安装完成" - fi - - # ----- 拉取代码(现在 git 已安装)----- + # ----- 拉取代码 ----- print_step "拉取代码..." rm -rf "$WORK_DIR" git clone --depth 1 --branch "$BRANCH" "$REPO_URL" "$WORK_DIR" cd "$WORK_DIR" mkdir -p bin static - print_success "代码拉取完成 (分支: ${BRANCH})" + print_success "代码拉取完成" # ----- 停止旧容器(拉取代码之后)----- if [ "$CONTAINER_EXISTS" = true ]; then @@ -574,24 +338,17 @@ do_deploy() { print_step "准备部署目录..." mkdir -p "$DEPLOY_DIR" mkdir -p "$DATA_DIR" - - # ----- 构建 Docker 镜像 ----- - print_step "构建 Docker 镜像..." - docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" \ - --build-arg VERSION="${TARGET_VERSION}" \ - --build-arg IMAGE_TAG="${IMAGE_TAG}" \ - . - - print_success "Docker 镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}" - - if [ "$CHANNEL" = "lts" ]; then - docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:lts" - print_info "已标记 ${IMAGE_NAME}:lts" + if [ -f "$DB_FILE" ]; then + print_info "数据库文件存在,将保留" else - docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:preview" - print_info "已标记 ${IMAGE_NAME}:preview" + print_info "数据库文件不存在,容器启动时将自动创建" fi + # ----- 构建 Docker 镜像(内部自动处理 go.mod 降级)----- + print_step "构建 Docker 镜像..." + docker build -t "${IMAGE_NAME}:latest" . + print_success "Docker 镜像构建完成: ${IMAGE_NAME}:latest" + # ----- 启动新容器 ----- print_step "启动 frpc-console 容器..." docker run -d \ @@ -601,7 +358,7 @@ do_deploy() { -v ${DEPLOY_DIR}:/app \ -e PORT=${PORT} \ -e TZ=Asia/Shanghai \ - ${IMAGE_NAME}:${IMAGE_TAG} + ${IMAGE_NAME}:latest if docker ps | grep -q frpc-console; then print_success "容器启动成功!" @@ -613,7 +370,6 @@ do_deploy() { # ----- 检查 frpc 子进程 ----- print_step "检查 frpc 状态..." sleep 3 - if docker ps --format '{{.Names}}' | grep -q "^frpc-console$"; then if docker exec frpc-console ps aux 2>/dev/null | grep -q "[f]rpc -c"; then print_success "frpc 进程运行正常" @@ -633,24 +389,6 @@ do_deploy() { print_warn "数据库为空或不可用,请通过 WebUI 注册管理员账户" fi - # ----- 验证版本写入 ----- - print_step "验证版本..." - sleep 1 - CONTAINER_VERSION=$(docker exec frpc-console cat /app/version.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo "unknown") - echo -e " 容器版本: ${CONTAINER_VERSION}" - echo -e " 目标版本: ${TARGET_VERSION}" - if [ "$CONTAINER_VERSION" = "$TARGET_VERSION" ]; then - print_success "版本写入成功" - else - print_warn "版本不匹配,请检查" - fi - - if [ -n "$BACKUP_DIR" ]; then - echo "" - print_warn "降级前数据已备份到: $BACKUP_DIR" - echo " 如需回退,请恢复: cp -r $BACKUP_DIR/frpc-console/* $DEPLOY_DIR/" - fi - # ----- 清理临时文件 ----- print_step "清理临时文件..." rm -rf "$WORK_DIR" @@ -660,21 +398,17 @@ do_deploy() { print_title print_success "frpc-console 部署完成!" print_title - echo "" echo -e " ${CYAN}📍 访问地址:${NC} http://$(hostname -I | awk '{print $1}'):${PORT}" echo -e " ${CYAN}📂 数据目录:${NC} ${DEPLOY_DIR}" echo -e " ${CYAN}📦 备份目录:${NC} /tmp/frpc-console/db-backups" echo -e " ${CYAN}🐳 容器名称:${NC} frpc-console" - echo -e " ${CYAN}🏷️ 版本:${NC} ${TARGET_VERSION}" - echo -e " ${CYAN}🌿 分支:${NC} ${BRANCH}" echo "" echo -e " ${CYAN}常用命令:${NC}" echo " docker logs frpc-console # 查看日志" echo " docker restart frpc-console # 重启服务" echo " docker stop frpc-console # 停止服务" echo " docker start frpc-console # 启动服务" - echo " cat ${DEPLOY_DIR}/version.ini # 查看当前版本" echo "" echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}" echo "" @@ -693,17 +427,6 @@ main() { check_tools check_container - select_channel - - # 直接从远程仓库读取版本信息,不依赖本地文件 - generate_target_version "$CHANNEL" "$BRANCH" - - if [ "$CONTAINER_EXISTS" = true ]; then - CURRENT_VERSION=$(get_current_version) - else - CURRENT_VERSION="(首次部署)" - fi - print_environment_summary if [ "$CHECK_ONLY" = true ]; then @@ -726,7 +449,6 @@ main() { if ! confirm_deploy; then custom_config - generate_plan print_deployment_plan if ! confirm_deploy; then print_info "已取消部署"