lxh2875931338/frpc-console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

全新优化的部署流程

Browse Source
This commit is contained in:
不安的亡命樱
2026-07-30 00:08:44 +08:00
parent 1748cee251
commit 826ce399e7
4 changed files with 235 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+2 -27
View File
@@ -1,53 +1,28 @@
# 多阶段构建 # 多阶段构建
FROM golang:alpine AS builder FROM golang:alpine AS builder
# ============================================================
# 构建参数：版本信息（由 deploy.sh 传入）
# ============================================================
ARG VERSION
ARG IMAGE_TAG
WORKDIR /app WORKDIR /app
# 复制依赖文件
COPY go.mod go.sum ./ COPY go.mod go.sum ./
# 降级 go.mod 并整理依赖
RUN sed -i 's/go 1.2[6-9].*/go 1.21/' go.mod && go mod tidy RUN sed -i 's/go 1.2[6-9].*/go 1.21/' go.mod && go mod tidy
# 设置代理
RUN go env -w GOPROXY=https://goproxy.cn,direct RUN go env -w GOPROXY=https://goproxy.cn,direct
# 下载依赖
RUN go mod download RUN go mod download
# 复制全部源码
COPY . . COPY . .
# ============================================================ # 编译时不注入任何版本信息（纯净二进制）
# 编译：注入版本信息
# ============================================================
RUN CGO_ENABLED=0 GOOS=linux go build \ RUN CGO_ENABLED=0 GOOS=linux go build \
-ldflags="-s -w -X main.buildVersion=${VERSION} -X main.buildImageTag=${IMAGE_TAG}" \ -ldflags="-s -w" \
-o frpc-console . -o frpc-console .
# 调试：确认二进制文件存在
RUN ls -lh /app/frpc-console
# ============================================================
# 运行镜像
# ============================================================
FROM alpine:latest FROM alpine:latest
# 安装工具
RUN apk --no-cache add ca-certificates tzdata sqlite RUN apk --no-cache add ca-certificates tzdata sqlite
WORKDIR /app WORKDIR /app
# 从构建阶段复制二进制
COPY --from=builder /app/frpc-console /app/frpc-console COPY --from=builder /app/frpc-console /app/frpc-console
# 复制静态文件
COPY static/ /app/static/ COPY static/ /app/static/
EXPOSE 9300 EXPOSE 9300
deploy.sh
+107 -288
View File
@@ -3,58 +3,39 @@
# ============================================================ # ============================================================
# frpc-console 一键部署脚本 (Docker 优先) # frpc-console 一键部署脚本 (Docker 优先)
# 用法: # 用法:
# curl -sSL .../deploy.sh | sudo bash # run-deploy.sh 引导后自动执行
# curl -sSL .../deploy.sh | sudo bash -s -- --channel preview
# ============================================================ # ============================================================
set -e set -e
# ---------- 颜色检测 ---------- # ---------- 颜色检测 ----------
if [ -t 1 ]; then if [ -t 1 ]; then
RED='\033[0;31m' RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'
GREEN='\033[0;32m' BLUE='\033[0;34m'; CYAN='\033[0;36m'; MAGENTA='\033[0;35m'; NC='\033[0m'
YELLOW='\033[1;33m'
BLUE='\033[0;34m'
CYAN='\033[0;36m'
MAGENTA='\033[0;35m'
NC='\033[0m'
else else
RED=''; GREEN=''; YELLOW=''; BLUE=''; CYAN=''; MAGENTA=''; NC='' RED=''; GREEN=''; YELLOW=''; BLUE=''; CYAN=''; MAGENTA=''; NC=''
fi fi
# ---------- 配置 ---------- # ---------- 配置 ----------
REPO_URL="https://git.whitetop.xyz/lxh2875931338/frpc-console.git" REPO_URL="https://git.whitetop.xyz/lxh2875931338/frpc-console.git"
BRANCH="main"
WORK_DIR="/tmp/frpc-console-build" WORK_DIR="/tmp/frpc-console-build"
DEFAULT_PORT=9300 DEFAULT_PORT=9300
DEFAULT_DEPLOY_DIR="/opt/frpc-console" DEFAULT_DEPLOY_DIR="/opt/frpc-console"
IMAGE_NAME="frpc-console" IMAGE_NAME="frpc-console"
KEEP_IMAGES=3
# ---------- 状态变量 ---------- # ---------- 状态变量 ----------
OS="" OS=""; OS_VERSION=""; ARCH=""
OS_VERSION="" HAS_GIT=false; HAS_CURL=false; HAS_WGET=false; HAS_DOCKER=false
ARCH="" NEED_INSTALL_GIT=false; NEED_INSTALL_CURL=false; NEED_INSTALL_WGET=false
HAS_GIT=false
HAS_CURL=false
HAS_WGET=false
HAS_DOCKER=false
NEED_INSTALL_GIT=false
NEED_INSTALL_CURL=false
NEED_INSTALL_WGET=false
PORT=${DEFAULT_PORT} PORT=${DEFAULT_PORT}
DEPLOY_DIR=${DEFAULT_DEPLOY_DIR} DEPLOY_DIR=${DEFAULT_DEPLOY_DIR}
DATA_DIR="${DEPLOY_DIR}/data" DATA_DIR="${DEPLOY_DIR}/data"
CONTAINER_EXISTS=false CONTAINER_EXISTS=false; CONTAINER_RUNNING=false
CONTAINER_RUNNING=false SKIP_CONFIRM=false; CHECK_ONLY=false; DRY_RUN=false
SKIP_CONFIRM=false CHANNEL=""; BRANCH=""; TARGET_VERSION=""; IMAGE_TAG=""
CHECK_ONLY=false
DRY_RUN=false
CHANNEL=""
CURRENT_VERSION="" CURRENT_VERSION=""
TARGET_VERSION=""
IMAGE_TAG=""
# ---------- 打印函数 ----------
print_info() { echo -e "${BLUE}[INFO]${NC} $1"; } print_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
print_success() { echo -e "${GREEN}[✓]${NC} $1"; } print_success() { echo -e "${GREEN}[✓]${NC} $1"; }
print_warn() { echo -e "${YELLOW}[⚠]${NC} $1"; } print_warn() { echo -e "${YELLOW}[⚠]${NC} $1"; }
@@ -67,50 +48,23 @@ print_subtitle() { echo -e "${MAGENTA} $1${NC}"; }
parse_args() { parse_args() {
for arg in "$@"; do for arg in "$@"; do
case $arg in case $arg in
--yes|-y) --yes|-y) SKIP_CONFIRM=true ;;
SKIP_CONFIRM=true --check) CHECK_ONLY=true ;;
;; --dry-run) DRY_RUN=true ;;
--check)
CHECK_ONLY=true
;;
--dry-run)
DRY_RUN=true
;;
--channel)
shift
CHANNEL="$1"
;;
--channel=*)
CHANNEL="${arg#*=}"
;;
--help|-h) --help|-h)
echo "用法: ./deploy.sh [选项]" echo "用法: ./deploy.sh [选项]"
echo ""
echo "选项:" echo "选项:"
echo " --channel lts 使用 LTS 通道 (main 分支)"
echo " --channel preview 使用 Preview 通道 (test 分支)"
echo " --yes, -y 跳过所有确认提示" echo " --yes, -y 跳过所有确认提示"
echo " --check 只检测环境，不执行部署" echo " --check 只检测环境，不执行部署"
echo " --dry-run 显示将执行的操作，不实际执行" echo " --dry-run 显示将执行的操作，不实际执行"
echo " --help, -h 显示帮助信息" echo " --help, -h 显示帮助信息"
echo ""
echo "示例:"
echo " ./deploy.sh # 交互式选择通道"
echo " ./deploy.sh --channel lts # 部署 LTS 版本"
echo " ./deploy.sh --channel preview # 部署 Preview 版本"
echo " ./deploy.sh --yes # 无人值守部署"
exit 0 exit 0
;; ;;
*) *) print_error "未知选项: $arg"; exit 1 ;;
print_error "未知选项: $arg"
echo "使用 --help 查看帮助"
exit 1
;;
esac esac
done done
} }
# ---------- 检查 root ----------
check_root() { check_root() {
if [ "$EUID" -ne 0 ]; then if [ "$EUID" -ne 0 ]; then
print_error "请使用 root 权限运行此脚本" print_error "请使用 root 权限运行此脚本"
@@ -119,19 +73,16 @@ check_root() {
fi fi
} }
# ---------- 检测操作系统 ----------
detect_os() { detect_os() {
if [ -f /etc/os-release ]; then if [ -f /etc/os-release ]; then
. /etc/os-release . /etc/os-release
OS=$ID OS=$ID; OS_VERSION=$VERSION_ID
OS_VERSION=$VERSION_ID
else else
print_error "无法识别操作系统" print_error "无法识别操作系统"
exit 1 exit 1
fi fi
} }
# ---------- 检测 CPU 架构 ----------
detect_arch() { detect_arch() {
ARCH=$(uname -m) ARCH=$(uname -m)
case $ARCH in case $ARCH in
@@ -145,7 +96,6 @@ detect_arch() {
esac esac
} }
# ---------- 检测工具 ----------
check_tools() { check_tools() {
command -v git &> /dev/null && HAS_GIT=true || NEED_INSTALL_GIT=true command -v git &> /dev/null && HAS_GIT=true || NEED_INSTALL_GIT=true
command -v curl &> /dev/null && HAS_CURL=true || NEED_INSTALL_CURL=true command -v curl &> /dev/null && HAS_CURL=true || NEED_INSTALL_CURL=true
@@ -153,7 +103,6 @@ check_tools() {
command -v docker &> /dev/null && HAS_DOCKER=true command -v docker &> /dev/null && HAS_DOCKER=true
} }
# ---------- 检查容器状态 ----------
check_container() { check_container() {
if docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^frpc-console$"; then if docker ps -a --format '{{.Names}}' 2>/dev/null | grep -q "^frpc-console$"; then
CONTAINER_EXISTS=true CONTAINER_EXISTS=true
@@ -163,70 +112,42 @@ check_container() {
fi fi
} }
# ---------- 版本管理函数 ---------- # ---------- 版本管理 ----------
# 直接从远程仓库读取 version.ini
read_version_from_remote() { read_version_from_remote() {
local branch="$1" local branch="$1"
local version_url="https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/${branch}/version.ini" local version_url="https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/${branch}/version.ini"
local content local content
content=$(curl -sSL "$version_url" 2>/dev/null) content=$(curl -sSL "$version_url" 2>/dev/null)
if [ -z "$content" ]; then if [ -z "$content" ]; then
print_error "无法从远程读取 version.ini: $version_url" print_error "无法从远程读取 version.ini: $version_url"
return 1 return 1
fi fi
SEMVER=$(echo "$content" | grep -v "^[;#]" | head -1 | awk '{print $1}') SEMVER=$(echo "$content" | grep -v "^[;#]" | head -1 | awk '{print $1}')
LTS_DATE=$(echo "$content" | grep -v "^[;#]" | head -1 | awk '{print $2}') echo "$SEMVER"
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() { generate_target_version() {
local channel="$1" local channel="$1"
local branch="${2:-$BRANCH}" local branch="${2:-$BRANCH}"
SEMVER=$(read_version_from_remote "$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 if [ -z "$SEMVER" ]; then
print_error "无法从 version.ini 读取语义版本" print_error "读取语义版本失败"
exit 1 exit 1
fi fi
local minor="${SEMVER#*.}"
local vtype if [ "$minor" = "0" ] || [ "$minor" = "5" ]; then
vtype=$(get_version_type "$SEMVER") CHANNEL_TYPE="lts"
else
if [ "$channel" = "lts" ] || [ "$vtype" = "lts" ]; then CHANNEL_TYPE="preview"
if [ -z "$LTS_DATE" ]; then
LTS_DATE=$(date +%Y%m%d)
print_warn "LTS 版本未指定日期，使用今天: $LTS_DATE"
fi fi
TARGET_VERSION="${SEMVER}-lts-${LTS_DATE}" if [ "$channel" = "lts" ] || [ "$CHANNEL_TYPE" = "lts" ]; then
IMAGE_TAG="${SEMVER}-lts-${LTS_DATE}" TARGET_VERSION="${SEMVER}-lts-$(date +%Y%m%d)"
IMAGE_TAG="${SEMVER}-lts-$(date +%Y%m%d)"
else else
TIMESTAMP=$(date +%Y%m%d-%H%M%S) TIMESTAMP=$(date +%Y%m%d-%H%M%S)
TARGET_VERSION="${SEMVER}-preview-${TIMESTAMP}" TARGET_VERSION="${SEMVER}-preview-${TIMESTAMP}"
IMAGE_TAG="preview-${TIMESTAMP}" IMAGE_TAG="preview-${TIMESTAMP}"
fi fi
echo "$TARGET_VERSION $IMAGE_TAG"
} }
get_current_version() { get_current_version() {
@@ -235,106 +156,52 @@ get_current_version() {
grep -v "^[;#]" "$version_file" | head -1 | tr -d '\n' grep -v "^[;#]" "$version_file" | head -1 | tr -d '\n'
else else
if [ "$CONTAINER_EXISTS" = true ]; then 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" docker exec frpc-console cat /app/version.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo ""
else else
echo "0.0.0-dev" echo ""
fi fi
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() { select_channel() {
if [ -n "$CHANNEL" ]; then if [ -n "$DEPLOY_CHANNEL" ] && [ -n "$DEPLOY_BRANCH" ]; then
if [ "$CHANNEL" != "lts" ] && [ "$CHANNEL" != "preview" ]; then CHANNEL="$DEPLOY_CHANNEL"
print_error "无效通道: $CHANNEL (仅支持 lts / preview)" BRANCH="$DEPLOY_BRANCH"
exit 1 print_info "使用环境变量: ${CHANNEL} 通道 (${BRANCH} 分支)"
fi return
if [ "$CHANNEL" = "preview" ]; then fi
BRANCH="test" if [ -n "$CHANNEL" ]; then
else if [ "$CHANNEL" != "lts" ] && [ "$CHANNEL" != "preview" ]; then
BRANCH="main" print_error "无效通道: $CHANNEL"
fi exit 1
print_info "使用命令行参数: ${CHANNEL} 通道 (${BRANCH} 分支)" fi
BRANCH="$([ "$CHANNEL" = "preview" ] && echo "test" || echo "main")"
return return
fi fi
echo "" echo ""
echo -e "${CYAN}请选择部署通道:${NC}" echo -e "${CYAN}请选择部署通道:${NC}"
echo " 1. LTS (稳定版，生产推荐) [默认] → main 分支" echo " 1. LTS (稳定版) [默认] → main 分支"
echo " 2. Preview (技术预览版，包含新特性) → test 分支" echo " 2. Preview (技术预览版) → test 分支"
echo "" echo ""
read -p "请选择 [1]: " CHANNEL_INPUT </dev/tty read -p "请选择 [1]: " CHANNEL_INPUT </dev/tty
CHANNEL_INPUT=${CHANNEL_INPUT:-1} CHANNEL_INPUT=${CHANNEL_INPUT:-1}
case $CHANNEL_INPUT in case $CHANNEL_INPUT in
1|"") 1|"") CHANNEL="lts"; BRANCH="main" ;;
CHANNEL="lts" 2) CHANNEL="preview"; BRANCH="test" ;;
BRANCH="main" *) print_error "无效选择"; exit 1 ;;
;;
2)
CHANNEL="preview"
BRANCH="test"
;;
*)
print_error "无效选择"
exit 1
;;
esac esac
print_info "已选择: ${CHANNEL} 通道 (${BRANCH} 分支)" print_info "已选择: ${CHANNEL} 通道 (${BRANCH} 分支)"
} }
# ---------- 检测结果汇总 ---------- # ---------- 环境汇总 ----------
print_environment_summary() { print_environment_summary() {
print_title print_title
print_subtitle "环境检测结果" print_subtitle "环境检测结果"
echo "" echo ""
echo -e " ${CYAN}操作系统:${NC} $OS $OS_VERSION" echo -e " ${CYAN}操作系统:${NC} $OS $OS_VERSION"
echo -e " ${CYAN}CPU 架构:${NC} $ARCH" echo -e " ${CYAN}CPU 架构:${NC} $ARCH"
echo "" echo ""
echo " ${CYAN}必要工具:${NC}" echo " ${CYAN}必要工具:${NC}"
if [ "$HAS_GIT" = true ]; then if [ "$HAS_GIT" = true ]; then
echo -e " git ✅ 已安装 ($(git --version | awk '{print $3}'))" echo -e " git ✅ 已安装 ($(git --version | awk '{print $3}'))"
@@ -351,7 +218,6 @@ print_environment_summary() {
else else
echo " wget ❌ 未安装 (将自动安装)" echo " wget ❌ 未安装 (将自动安装)"
fi fi
echo "" echo ""
echo " ${CYAN}Docker 环境:${NC}" echo " ${CYAN}Docker 环境:${NC}"
if [ "$HAS_DOCKER" = true ]; then if [ "$HAS_DOCKER" = true ]; then
@@ -359,14 +225,8 @@ print_environment_summary() {
else else
echo " docker ❌ 未安装" echo " docker ❌ 未安装"
print_error "Docker 未安装，请先安装 Docker" print_error "Docker 未安装，请先安装 Docker"
echo ""
echo " 快速安装:"
echo " curl -fsSL https://get.docker.com | bash"
echo " systemctl enable --now docker"
echo ""
exit 1 exit 1
fi fi
if [ "$CONTAINER_EXISTS" = true ]; then if [ "$CONTAINER_EXISTS" = true ]; then
echo "" echo ""
echo " ${CYAN}容器状态:${NC}" echo " ${CYAN}容器状态:${NC}"
@@ -376,13 +236,12 @@ print_environment_summary() {
echo -e " frpc-console ⏸️ 已停止" echo -e " frpc-console ⏸️ 已停止"
fi fi
CURRENT_VERSION=$(get_current_version) CURRENT_VERSION=$(get_current_version)
echo -e " ${CYAN}当前版本:${NC} $CURRENT_VERSION" [ -n "$CURRENT_VERSION" ] && echo -e " ${CYAN}当前版本:${NC} $CURRENT_VERSION"
fi fi
echo "" echo ""
} }
# ---------- 生成操作列表 ---------- # ---------- 部署计划 ----------
generate_plan() { generate_plan() {
PLAN="" PLAN=""
if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then
@@ -401,15 +260,12 @@ generate_plan() {
PLAN="${PLAN} • 启动 frpc-console 容器 (端口 ${PORT})" PLAN="${PLAN} • 启动 frpc-console 容器 (端口 ${PORT})"
} }
# ---------- 展示部署计划 ----------
print_deployment_plan() { print_deployment_plan() {
print_title print_title
print_subtitle "部署计划" print_subtitle "部署计划"
echo "" echo ""
echo -e " ${CYAN}将执行以下操作:${NC}" echo -e " ${CYAN}将执行以下操作:${NC}"
echo -e "$(echo -e "$PLAN")" echo -e "$(echo -e "$PLAN")"
echo "" echo ""
echo -e " ${CYAN}配置信息:${NC}" echo -e " ${CYAN}配置信息:${NC}"
echo -e " ────────────────────────────────────" echo -e " ────────────────────────────────────"
@@ -419,46 +275,37 @@ print_deployment_plan() {
echo -e " 镜像标签 : ${IMAGE_TAG}" echo -e " 镜像标签 : ${IMAGE_TAG}"
echo -e " 源码分支 : ${BRANCH}" echo -e " 源码分支 : ${BRANCH}"
echo -e " ────────────────────────────────────" echo -e " ────────────────────────────────────"
if [ "$CONTAINER_EXISTS" = true ]; then if [ "$CONTAINER_EXISTS" = true ]; then
echo "" echo ""
echo -e " ${YELLOW}⚠ 检测到已存在的 frpc-console 容器${NC}" echo -e " ${YELLOW}⚠ 检测到已存在的 frpc-console 容器${NC}"
echo -e " 当前版本: ${CURRENT_VERSION}" echo -e " 当前版本: ${CURRENT_VERSION}"
echo -e " 目标版本: ${TARGET_VERSION}" echo -e " 目标版本: ${TARGET_VERSION}"
fi fi
echo "" echo ""
} }
# ---------- 确认部署 ----------
confirm_deploy() { confirm_deploy() {
if [ "$SKIP_CONFIRM" = true ]; then if [ "$SKIP_CONFIRM" = true ]; then
echo -e "${GREEN}▶ 已启用 --yes，自动确认${NC}" echo -e "${GREEN}▶ 已启用 --yes，自动确认${NC}"
return 0 return 0
fi fi
echo -e -n "${CYAN}确认执行? 输入 Y 继续，输入 n 自定义配置 [Y/n]: ${NC}" echo -e -n "${CYAN}确认执行? 输入 Y 继续，输入 n 自定义配置 [Y/n]: ${NC}"
read -r CONFIRM </dev/tty read -r CONFIRM </dev/tty
case $CONFIRM in case $CONFIRM in
n|N) return 1 ;; n|N) return 1 ;;
*) return 0 ;; *) return 0 ;;
esac esac
} }
# ---------- 自定义配置 ----------
custom_config() { custom_config() {
print_title print_title
print_subtitle "自定义配置" print_subtitle "自定义配置"
echo "" echo ""
read -p "请输入监听端口 [${DEFAULT_PORT}]: " INPUT_PORT </dev/tty read -p "请输入监听端口 [${DEFAULT_PORT}]: " INPUT_PORT </dev/tty
PORT=${INPUT_PORT:-$DEFAULT_PORT} PORT=${INPUT_PORT:-$DEFAULT_PORT}
read -p "请输入部署目录 [${DEFAULT_DEPLOY_DIR}]: " INPUT_DEPLOY_DIR </dev/tty read -p "请输入部署目录 [${DEFAULT_DEPLOY_DIR}]: " INPUT_DEPLOY_DIR </dev/tty
DEPLOY_DIR=${INPUT_DEPLOY_DIR:-$DEFAULT_DEPLOY_DIR} DEPLOY_DIR=${INPUT_DEPLOY_DIR:-$DEFAULT_DEPLOY_DIR}
DATA_DIR="${DEPLOY_DIR}/data" DATA_DIR="${DEPLOY_DIR}/data"
echo "" echo ""
echo -e " ${CYAN}更新后的配置:${NC}" echo -e " ${CYAN}更新后的配置:${NC}"
echo -e " ────────────────────────────────────" echo -e " ────────────────────────────────────"
@@ -475,32 +322,24 @@ do_deploy() {
print_subtitle "开始部署" print_subtitle "开始部署"
echo "" echo ""
# ----- 事务前钩子：备份数据库（仅降级时备份） ----- # ----- 事务前钩子：备份数据库（仅降级时） -----
BACKUP_DIR="" BACKUP_DIR=""
if [ -n "$CURRENT_VERSION" ] && [ -n "$TARGET_VERSION" ]; then
# 如果是首次部署，跳过版本比对（因为版本文件不存在） # 提取语义版本比较
if [ -n "$CURRENT_VERSION" ] && [ "$CURRENT_VERSION" != "0.0.0-dev" ] && [ "$CURRENT_VERSION" != "(首次部署)" ]; then CUR_SEMVER=$(echo "$CURRENT_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/')
compare_version "$CURRENT_VERSION" "$TARGET_VERSION" TGT_SEMVER=$(echo "$TARGET_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/')
COMPARE_RESULT=$? if [ "$TGT_SEMVER" \< "$CUR_SEMVER" ] 2>/dev/null; then
if [ $COMPARE_RESULT -eq 2 ]; then
print_warn "检测到降级操作: $CURRENT_VERSION → $TARGET_VERSION" print_warn "检测到降级操作: $CURRENT_VERSION → $TARGET_VERSION"
echo "" echo ""
echo -e "${YELLOW}⚠ 降级可能导致数据不兼容${NC}" echo -e "${YELLOW}⚠ 降级可能导致数据不兼容${NC}"
echo " 当前版本: $CURRENT_VERSION"
echo " 目标版本: $TARGET_VERSION"
echo ""
echo -e "${CYAN}将备份完整数据目录到:${NC}"
TIMESTAMP=$(date +%Y%m%d_%H%M%S) TIMESTAMP=$(date +%Y%m%d_%H%M%S)
BACKUP_DIR="/opt/frpc-console-backups/${TIMESTAMP}_${CHANNEL}" BACKUP_DIR="/opt/frpc-console-backups/${TIMESTAMP}_${CHANNEL}"
echo " $BACKUP_DIR" echo -e "${CYAN}备份目录: ${BACKUP_DIR}${NC}"
echo ""
read -p "确认执行降级? [y/N]: " CONFIRM_DOWNGRADE </dev/tty read -p "确认执行降级? [y/N]: " CONFIRM_DOWNGRADE </dev/tty
if [[ ! "$CONFIRM_DOWNGRADE" =~ ^[Yy]$ ]]; then if [[ ! "$CONFIRM_DOWNGRADE" =~ ^[Yy]$ ]]; then
print_info "已取消降级操作" print_info "已取消降级操作"
exit 0 exit 0
fi fi
print_step "执行降级前备份..." print_step "执行降级前备份..."
mkdir -p "$BACKUP_DIR" mkdir -p "$BACKUP_DIR"
if [ -d "$DEPLOY_DIR" ]; then if [ -d "$DEPLOY_DIR" ]; then
@@ -514,45 +353,31 @@ do_deploy() {
print_info "首次部署，跳过版本比对" print_info "首次部署，跳过版本比对"
fi fi
# ----- 安装必要工具（必须在拉取代码之前！）----- # ----- 安装必要工具 -----
if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then if [ "$NEED_INSTALL_GIT" = true ] || [ "$NEED_INSTALL_CURL" = true ] || [ "$NEED_INSTALL_WGET" = true ]; then
print_step "安装必要工具..." print_step "安装必要工具..."
local pkgs="" local pkgs=""
[ "$NEED_INSTALL_GIT" = true ] && pkgs="${pkgs} git" [ "$NEED_INSTALL_GIT" = true ] && pkgs="${pkgs} git"
[ "$NEED_INSTALL_CURL" = true ] && pkgs="${pkgs} curl" [ "$NEED_INSTALL_CURL" = true ] && pkgs="${pkgs} curl"
[ "$NEED_INSTALL_WGET" = true ] && pkgs="${pkgs} wget" [ "$NEED_INSTALL_WGET" = true ] && pkgs="${pkgs} wget"
case $OS in case $OS in
opensuse*|suse*|opensuse-tumbleweed|opensuse-slowroll|opensuse-leap) opensuse*|suse*|opensuse-tumbleweed|opensuse-slowroll|opensuse-leap)
if [ "$NEED_INSTALL_GIT" = true ]; then if [ "$NEED_INSTALL_GIT" = true ]; then
zypper install -y git-core zypper install -y git-core
pkgs=$(echo "$pkgs" | sed -E 's/(^| )git( |$)/ /g' | sed 's/ */ /g' | sed 's/^ //;s/ $//') pkgs=$(echo "$pkgs" | sed -E 's/(^| )git( |$)/ /g' | sed 's/ */ /g' | sed 's/^ //;s/ $//')
fi fi
if [ -n "$pkgs" ]; then [ -n "$pkgs" ] && zypper install -y $pkgs
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
;; ;;
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 "无法识别包管理器"; exit 1 ;;
esac esac
print_success "必要工具安装完成" print_success "必要工具安装完成"
fi fi
# ----- 拉取代码（现在 git 已安装）----- # ----- 拉取代码 -----
print_step "拉取代码..." print_step "拉取代码..."
rm -rf "$WORK_DIR" rm -rf "$WORK_DIR"
git clone --depth 1 --branch "$BRANCH" "$REPO_URL" "$WORK_DIR" git clone --depth 1 --branch "$BRANCH" "$REPO_URL" "$WORK_DIR"
@@ -560,7 +385,7 @@ do_deploy() {
mkdir -p bin static mkdir -p bin static
print_success "代码拉取完成 (分支: ${BRANCH})" print_success "代码拉取完成 (分支: ${BRANCH})"
# ----- 停止旧容器（拉取代码之后）----- # ----- 停止旧容器 -----
if [ "$CONTAINER_EXISTS" = true ]; then if [ "$CONTAINER_EXISTS" = true ]; then
print_step "停止旧容器..." print_step "停止旧容器..."
if [ "$CONTAINER_RUNNING" = true ]; then if [ "$CONTAINER_RUNNING" = true ]; then
@@ -577,13 +402,25 @@ do_deploy() {
# ----- 构建 Docker 镜像 ----- # ----- 构建 Docker 镜像 -----
print_step "构建 Docker 镜像..." print_step "构建 Docker 镜像..."
docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" \ docker build --no-cache \
--build-arg VERSION="${TARGET_VERSION}" \ -t "${IMAGE_NAME}:${IMAGE_TAG}" \
--build-arg IMAGE_TAG="${IMAGE_TAG}" \
. .
if [ $? -ne 0 ]; then
print_error "Docker 构建失败"
exit 1
fi
print_success "Docker 镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}" print_success "Docker 镜像构建完成: ${IMAGE_NAME}:${IMAGE_TAG}"
# 验证镜像内容
print_step "验证镜像内容..."
if docker run --rm --entrypoint ls "${IMAGE_NAME}:${IMAGE_TAG}" -l /app/frpc-console 2>/dev/null; then
print_success "二进制文件存在于镜像中"
else
print_error "镜像中缺少 /app/frpc-console"
exit 1
fi
# 标记通道标签
if [ "$CHANNEL" = "lts" ]; then if [ "$CHANNEL" = "lts" ]; then
docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:lts" docker tag "${IMAGE_NAME}:${IMAGE_TAG}" "${IMAGE_NAME}:lts"
print_info "已标记 ${IMAGE_NAME}:lts" print_info "已标记 ${IMAGE_NAME}:lts"
@@ -610,10 +447,14 @@ do_deploy() {
exit 1 exit 1
fi fi
# ----- 写入版本文件 -----
print_step "写入版本文件..."
echo "$TARGET_VERSION" > "${DEPLOY_DIR}/version.ini"
print_success "版本写入: ${TARGET_VERSION}"
# ----- 检查 frpc 子进程 ----- # ----- 检查 frpc 子进程 -----
print_step "检查 frpc 状态..." print_step "检查 frpc 状态..."
sleep 3 sleep 3
if docker ps --format '{{.Names}}' | grep -q "^frpc-console$"; then 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 if docker exec frpc-console ps aux 2>/dev/null | grep -q "[f]rpc -c"; then
print_success "frpc 进程运行正常" print_success "frpc 进程运行正常"
@@ -621,11 +462,11 @@ do_deploy() {
print_warn "frpc 进程未运行（可能配置为空，请在 WebUI 中导入 TOML）" print_warn "frpc 进程未运行（可能配置为空，请在 WebUI 中导入 TOML）"
fi fi
else else
print_error "frpc-console 容器未运行，请检查日志" print_error "frpc-console 容器未运行"
exit 1 exit 1
fi fi
# ----- 事务后钩子：检测数据库 ----- # ----- 验证数据库 -----
print_step "验证数据库状态..." print_step "验证数据库状态..."
if docker exec frpc-console sqlite3 /app/frpc-console.db "SELECT COUNT(*) FROM users;" 2>/dev/null | grep -q "^[0-9]"; then if docker exec frpc-console sqlite3 /app/frpc-console.db "SELECT COUNT(*) FROM users;" 2>/dev/null | grep -q "^[0-9]"; then
print_success "数据库可用" print_success "数据库可用"
@@ -633,31 +474,16 @@ do_deploy() {
print_warn "数据库为空或不可用，请通过 WebUI 注册管理员账户" print_warn "数据库为空或不可用，请通过 WebUI 注册管理员账户"
fi fi
# ----- 验证版本写入 ----- # ----- 验证版本 -----
# ----- 验证版本写入 ----- CONTAINER_VERSION=$(docker exec frpc-console cat /app/version.ini 2>/dev/null | tr -d '\n' || echo "")
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 if [ "$CONTAINER_VERSION" = "$TARGET_VERSION" ]; then
print_success "版本写入成功" print_success "容器版本验证通过: ${CONTAINER_VERSION}"
else else
print_warn "版本不匹配，请检查" print_warn "容器版本: ${CONTAINER_VERSION}, 目标版本: ${TARGET_VERSION}"
fi fi
if [ -n "$BACKUP_DIR" ]; then # ----- 清理旧镜像 -----
echo ""
print_warn "降级前数据已备份到: $BACKUP_DIR"
echo " 如需回退，请恢复: cp -r $BACKUP_DIR/frpc-console/* $DEPLOY_DIR/"
fi
# ----- 事务后钩子：清理旧镜像 -----
print_step "清理旧镜像..." print_step "清理旧镜像..."
# 保留最近 3 个镜像（包括刚构建的）
KEEP_COUNT=3
CURRENT_IMAGE_ID=$(docker images -q "${IMAGE_NAME}:${IMAGE_TAG}" 2>/dev/null) CURRENT_IMAGE_ID=$(docker images -q "${IMAGE_NAME}:${IMAGE_TAG}" 2>/dev/null)
if [ -n "$CURRENT_IMAGE_ID" ]; then if [ -n "$CURRENT_IMAGE_ID" ]; then
ALL_IMAGES=$(docker images "${IMAGE_NAME}:*" --format "{{.ID}} {{.CreatedAt}}" 2>/dev/null | sort -k2 -r | awk '{print $1}') ALL_IMAGES=$(docker images "${IMAGE_NAME}:*" --format "{{.ID}} {{.CreatedAt}}" 2>/dev/null | sort -k2 -r | awk '{print $1}')
@@ -668,7 +494,7 @@ do_deploy() {
continue continue
fi fi
COUNTER=$((COUNTER + 1)) COUNTER=$((COUNTER + 1))
if [ $COUNTER -le $KEEP_COUNT ]; then if [ $COUNTER -le $KEEP_IMAGES ]; then
continue continue
fi fi
TO_DELETE="$TO_DELETE $IMG_ID" TO_DELETE="$TO_DELETE $IMG_ID"
@@ -679,8 +505,13 @@ do_deploy() {
else else
print_info "无需清理，镜像数量未超过保留策略" print_info "无需清理，镜像数量未超过保留策略"
fi fi
else fi
print_warn "无法获取当前镜像 ID，跳过清理"
# ----- 备份目录提示 -----
if [ -n "$BACKUP_DIR" ]; then
echo ""
print_warn "降级前数据已备份到: $BACKUP_DIR"
echo " 如需回退: cp -r $BACKUP_DIR/frpc-console/* $DEPLOY_DIR/"
fi fi
# ----- 清理临时文件 ----- # ----- 清理临时文件 -----
@@ -688,15 +519,13 @@ do_deploy() {
rm -rf "$WORK_DIR" rm -rf "$WORK_DIR"
print_success "临时文件已清理" print_success "临时文件已清理"
# ----- 输出信息 ----- # ----- 输出 -----
print_title print_title
print_success "frpc-console 部署完成！" print_success "frpc-console 部署完成！"
print_title print_title
echo "" echo ""
echo -e " ${CYAN}📍 访问地址:${NC} http://$(hostname -I | awk '{print $1}'):${PORT}" echo -e " ${CYAN}📍 访问地址:${NC} http://$(hostname -I | awk '{print $1}'):${PORT}"
echo -e " ${CYAN}📂 数据目录:${NC} ${DEPLOY_DIR}" 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} frpc-console"
echo -e " ${CYAN}🏷️ 版本:${NC} ${TARGET_VERSION}" echo -e " ${CYAN}🏷️ 版本:${NC} ${TARGET_VERSION}"
echo -e " ${CYAN}🌿 分支:${NC} ${BRANCH}" echo -e " ${CYAN}🌿 分支:${NC} ${BRANCH}"
@@ -704,8 +533,6 @@ do_deploy() {
echo -e " ${CYAN}常用命令:${NC}" echo -e " ${CYAN}常用命令:${NC}"
echo " docker logs frpc-console # 查看日志" echo " docker logs frpc-console # 查看日志"
echo " docker restart frpc-console # 重启服务" echo " docker restart frpc-console # 重启服务"
echo " docker stop frpc-console # 停止服务"
echo " docker start frpc-console # 启动服务"
echo " cat ${DEPLOY_DIR}/version.ini # 查看当前版本" echo " cat ${DEPLOY_DIR}/version.ini # 查看当前版本"
echo "" echo ""
echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}" echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}"
@@ -726,30 +553,22 @@ main() {
check_container check_container
select_channel select_channel
# 直接从远程仓库读取版本信息，不依赖本地文件
generate_target_version "$CHANNEL" "$BRANCH" generate_target_version "$CHANNEL" "$BRANCH"
CURRENT_VERSION=""
if [ "$CONTAINER_EXISTS" = true ]; then if [ "$CONTAINER_EXISTS" = true ]; then
CURRENT_VERSION=$(get_current_version) CURRENT_VERSION=$(get_current_version)
else
CURRENT_VERSION="(首次部署)"
fi fi
print_environment_summary print_environment_summary
if [ "$CHECK_ONLY" = true ]; then if [ "$CHECK_ONLY" = true ]; then
print_info "环境检测完成（--check 模式，不执行部署）" print_info "环境检测完成（--check 模式）"
exit 0 exit 0
fi fi
if [ "$HAS_DOCKER" = false ]; then if [ "$HAS_DOCKER" = false ]; then
print_error "Docker 未安装，请先安装 Docker" print_error "Docker 未安装"
echo ""
echo " 快速安装:"
echo " curl -fsSL https://get.docker.com | bash"
echo " systemctl enable --now docker"
echo ""
exit 1 exit 1
fi fi
@@ -767,7 +586,7 @@ main() {
fi fi
if [ "$DRY_RUN" = true ]; then if [ "$DRY_RUN" = true ]; then
print_info "演练模式（--dry-run），不实际执行部署" print_info "演练模式（--dry-run）"
exit 0 exit 0
fi fi
main.go
+6 -12
View File
@@ -3,22 +3,17 @@ package main
import ( import (
"log" "log"
"os" "os"
"strings"
"time" "time"
) )
// 由 build.go 通过 -ldflags 注入
var (
buildVersion = "0.0.0-dev"
buildImageTag = "dev"
buildTime = "unknown"
)
func main() { func main() {
// 写入 version.ini 到持久化目录 // 读取 version.ini 显示版本（如果存在）
if err := os.WriteFile("./version.ini", []byte(buildVersion+"\n"), 0644); err != nil { if data, err := os.ReadFile("./version.ini"); err == nil {
log.Printf("⚠️ 写入 version.ini 失败: %v", err) version := strings.TrimSpace(string(data))
log.Printf("📌 版本: %s", version)
} else { } else {
log.Printf("📌 版本: %s", buildVersion) log.Printf("📌 版本: (未记录)")
} }
if err := InitDB(); err != nil { if err := InitDB(); err != nil {
@@ -48,7 +43,6 @@ func main() {
func startWatchdog() { func startWatchdog() {
ticker := time.NewTicker(30 * time.Second) ticker := time.NewTicker(30 * time.Second)
defer ticker.Stop() defer ticker.Stop()
for range ticker.C { for range ticker.C {
if !isFrpcRunning() { if !isFrpcRunning() {
log.Println("⚠️ frpc 进程已停止，自动重启...") log.Println("⚠️ frpc 进程已停止，自动重启...")
run-deploy.sh
+115
View File
@@ -0,0 +1,115 @@
#!/bin/bash
# ============================================================
# frpc-console 部署入口（前置引导脚本）
# 此脚本固定在 main 分支，永不变化。
# 职责：引导用户选择通道，拉取对应分支的 deploy.sh 并执行
#
# 用法:
# curl -sSL https://git.whitetop.xyz/.../run-deploy.sh | sudo bash
# curl -sSL https://git.whitetop.xyz/.../run-deploy.sh | sudo bash -s -- --channel preview
# ============================================================
set -e
if [ -t 1 ]; then
RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'
BLUE='\033[0;34m'; CYAN='\033[0;36m'; MAGENTA='\033[0;35m'; NC='\033[0m'
else
RED=''; GREEN=''; YELLOW=''; BLUE=''; CYAN=''; MAGENTA=''; NC=''
fi
print_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
print_error() { echo -e "${RED}[✗]${NC} $1"; }
REPO_URL="https://git.whitetop.xyz/lxh2875931338/frpc-console.git"
WORK_DIR="/tmp/frpc-console-deploy"
CHANNEL=""
BRANCH=""
parse_args() {
for arg in "$@"; do
case $arg in
--channel)
shift; CHANNEL="$1"
;;
--channel=*)
CHANNEL="${arg#*=}"
;;
--help|-h)
echo "用法: curl .../run-deploy.sh | sudo bash -s -- [选项]"
echo ""
echo "选项:"
echo " --channel lts 使用 LTS 通道 (main 分支)"
echo " --channel preview 使用 Preview 通道 (test 分支)"
echo " --help, -h 显示帮助信息"
exit 0
;;
*)
print_error "未知选项: $arg"
echo "使用 --help 查看帮助"
exit 1
;;
esac
done
}
select_channel() {
if [ -n "$CHANNEL" ]; then
if [ "$CHANNEL" != "lts" ] && [ "$CHANNEL" != "preview" ]; then
print_error "无效通道: $CHANNEL (仅支持 lts / preview)"
exit 1
fi
BRANCH="$([ "$CHANNEL" = "preview" ] && echo "test" || echo "main")"
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/tty
CHANNEL_INPUT=${CHANNEL_INPUT:-1}
case $CHANNEL_INPUT in
1|"") CHANNEL="lts"; BRANCH="main" ;;
2) CHANNEL="preview"; BRANCH="test" ;;
*) print_error "无效选择"; exit 1 ;;
esac
print_info "已选择: ${CHANNEL} 通道 (${BRANCH} 分支)"
}
fetch_and_run() {
local deploy_url="https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/${BRANCH}/deploy.sh"
echo ""
echo -e "${CYAN}▶ 从 ${BRANCH} 分支拉取 deploy.sh...${NC}"
rm -rf "$WORK_DIR"
mkdir -p "$WORK_DIR"
cd "$WORK_DIR"
if ! curl -sSL -o deploy.sh "$deploy_url"; then
print_error "无法下载 deploy.sh: $deploy_url"
exit 1
fi
chmod +x deploy.sh
echo -e "${GREEN}[✓] deploy.sh 已拉取${NC}"
echo ""
echo -e "${CYAN}▶ 执行部署脚本...${NC}"
echo ""
export DEPLOY_CHANNEL="$CHANNEL"
export DEPLOY_BRANCH="$BRANCH"
exec ./deploy.sh "$@"
}
main() {
clear 2>/dev/null || true
echo -e "${MAGENTA}════════════════════════════════════════════════════════${NC}"
echo -e "${MAGENTA} frpc-console 部署入口${NC}"
echo -e "${MAGENTA}════════════════════════════════════════════════════════${NC}"
echo ""
parse_args "$@"
select_channel
fetch_and_run "$@"
}
main "$@"