Compare commits
33
Commits
d122456276
...
1473083548
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1473083548 | ||
|
|
0147f482e2 | ||
|
|
94558dfa25 | ||
|
|
26f184399f | ||
|
|
bd40eea81c | ||
|
|
461831414b | ||
|
|
2ad151e44b | ||
|
|
5a28775f84 | ||
|
|
93d11d00a2 | ||
|
|
5c89232004 | ||
|
|
cd178a1a9d | ||
|
|
a87e9aa0b8 | ||
|
|
205525c243 | ||
|
|
16204200de | ||
|
|
e1cf6f4f47 | ||
|
|
a5c33580e2 | ||
|
|
f2af48f8d0 | ||
|
|
2663e71b4f | ||
|
|
bf24d3cb00 | ||
|
|
00f2b9fd14 | ||
|
|
76ac9503c6 | ||
|
|
04851d244f | ||
|
|
a2f4326882 | ||
|
|
4cd438ed3e | ||
|
|
1bfa2383c1 | ||
|
|
b13f2d5047 | ||
|
|
7a2737bc83 | ||
|
|
1fd845a981 | ||
|
|
f9a97a0af5 | ||
|
|
ab73a38f06 | ||
|
|
21c9c9556b | ||
|
|
509de72d10 | ||
|
|
74a054d90c |
@@ -151,12 +151,12 @@ generate_target_version() {
|
||||
}
|
||||
|
||||
get_current_version() {
|
||||
local version_file="${DEPLOY_DIR}/version.ini"
|
||||
local version_file="${DEPLOY_DIR}/data/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 ""
|
||||
docker exec frpc-console cat /app/data/version.ini 2>/dev/null | grep -v "^[;#]" | head -1 | tr -d '\n' || echo ""
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
@@ -325,7 +325,6 @@ do_deploy() {
|
||||
# ----- 事务前钩子:备份数据库(仅降级时) -----
|
||||
BACKUP_DIR=""
|
||||
if [ -n "$CURRENT_VERSION" ] && [ -n "$TARGET_VERSION" ]; then
|
||||
# 提取语义版本比较
|
||||
CUR_SEMVER=$(echo "$CURRENT_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/')
|
||||
TGT_SEMVER=$(echo "$TARGET_VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*$/\1/')
|
||||
if [ "$TGT_SEMVER" \< "$CUR_SEMVER" ] 2>/dev/null; then
|
||||
@@ -396,25 +395,23 @@ do_deploy() {
|
||||
fi
|
||||
|
||||
# ----- 准备部署目录 -----
|
||||
print_step "准备部署目录..."
|
||||
mkdir -p "$DEPLOY_DIR"
|
||||
mkdir -p "$DATA_DIR"
|
||||
print_step "准备部署目录..."
|
||||
mkdir -p "$DEPLOY_DIR"
|
||||
mkdir -p "$DATA_DIR"
|
||||
|
||||
# ----- 检测并迁移旧版本文件(从根目录迁移到 data/)-----
|
||||
print_step "检测旧版本文件..."
|
||||
# ----- 检测并迁移旧版本文件(从根目录迁移到 data/)-----
|
||||
print_step "检测旧版本文件..."
|
||||
|
||||
OLD_DB="${DEPLOY_DIR}/frpc-console.db"
|
||||
OLD_TOML="${DEPLOY_DIR}/frpc.toml"
|
||||
OLD_LOG="${DEPLOY_DIR}/frpc.log"
|
||||
OLD_PID="${DEPLOY_DIR}/frpc.pid"
|
||||
OLD_VERSION="${DEPLOY_DIR}/version.ini"
|
||||
NEW_DB="${DATA_DIR}/frpc-console.db"
|
||||
OLD_DB="${DEPLOY_DIR}/frpc-console.db"
|
||||
OLD_TOML="${DEPLOY_DIR}/frpc.toml"
|
||||
OLD_LOG="${DEPLOY_DIR}/frpc.log"
|
||||
OLD_PID="${DEPLOY_DIR}/frpc.pid"
|
||||
OLD_VERSION="${DEPLOY_DIR}/version.ini"
|
||||
NEW_DB="${DATA_DIR}/frpc-console.db"
|
||||
|
||||
# 如果根目录有旧数据库文件,但 data/ 目录没有,执行迁移
|
||||
if [ -f "$OLD_DB" ] && [ ! -f "$NEW_DB" ]; then
|
||||
if [ -f "$OLD_DB" ] && [ ! -f "$NEW_DB" ]; then
|
||||
print_warn "检测到旧版本数据库文件在根目录,将迁移到 data/ 子目录"
|
||||
|
||||
# 备份旧文件
|
||||
BACKUP_OLD_DIR="${DEPLOY_DIR}/.old_backup_$(date +%Y%m%d_%H%M%S)"
|
||||
mkdir -p "$BACKUP_OLD_DIR"
|
||||
|
||||
@@ -425,7 +422,6 @@ if [ -f "$OLD_DB" ] && [ ! -f "$NEW_DB" ]; then
|
||||
fi
|
||||
done
|
||||
|
||||
# 复制文件到 data/ 目录
|
||||
for file in frpc-console.db frpc.toml frpc.log frpc.pid version.ini; do
|
||||
if [ -f "${DEPLOY_DIR}/${file}" ]; then
|
||||
cp "${DEPLOY_DIR}/${file}" "${DATA_DIR}/" 2>/dev/null || true
|
||||
@@ -436,13 +432,13 @@ if [ -f "$OLD_DB" ] && [ ! -f "$NEW_DB" ]; then
|
||||
print_success "旧文件已迁移到 data/ 目录"
|
||||
print_info "旧文件备份位置: ${BACKUP_OLD_DIR}"
|
||||
print_info "确认服务正常后,可手动删除备份目录"
|
||||
else
|
||||
else
|
||||
print_info "未检测到需要迁移的旧文件"
|
||||
fi
|
||||
fi
|
||||
|
||||
# ----- 构建 Docker 镜像 -----
|
||||
print_step "构建 Docker 镜像..."
|
||||
docker build --no-cache \
|
||||
# ----- 构建 Docker 镜像 -----
|
||||
print_step "构建 Docker 镜像..."
|
||||
docker build --no-cache \
|
||||
-t "${IMAGE_NAME}:${IMAGE_TAG}" \
|
||||
.
|
||||
if [ $? -ne 0 ]; then
|
||||
@@ -471,7 +467,6 @@ docker build --no-cache \
|
||||
|
||||
# ----- 启动新容器 -----
|
||||
print_step "启动 frpc-console 容器..."
|
||||
# 启动容器(只挂载数据目录)
|
||||
docker run -d \
|
||||
--name frpc-console \
|
||||
--restart=always \
|
||||
@@ -509,20 +504,24 @@ docker build --no-cache \
|
||||
print_warn "frpc 进程未运行(PID 文件不存在,请导入 TOML 后重试)"
|
||||
fi
|
||||
|
||||
# ----- 验证数据库 -----
|
||||
# ----- 事务后钩子:检测数据库 -----
|
||||
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/data/frpc-console.db "SELECT COUNT(*) FROM users;" 2>/dev/null | grep -q "^[0-9]"; then
|
||||
print_success "数据库可用"
|
||||
else
|
||||
print_warn "数据库为空或不可用,请通过 WebUI 注册管理员账户"
|
||||
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/data/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 "容器版本验证通过: ${CONTAINER_VERSION}"
|
||||
print_success "版本写入成功"
|
||||
else
|
||||
print_warn "容器版本: ${CONTAINER_VERSION}, 目标版本: ${TARGET_VERSION}"
|
||||
print_warn "版本不匹配,请检查"
|
||||
fi
|
||||
|
||||
# ----- 清理旧镜像 -----
|
||||
@@ -576,7 +575,7 @@ docker build --no-cache \
|
||||
echo -e " ${CYAN}常用命令:${NC}"
|
||||
echo " docker logs frpc-console # 查看日志"
|
||||
echo " docker restart frpc-console # 重启服务"
|
||||
echo " cat ${DEPLOY_DIR}/version.ini # 查看当前版本"
|
||||
echo " cat ${DEPLOY_DIR}/data/version.ini # 查看当前版本"
|
||||
echo ""
|
||||
echo -e " ${YELLOW}首次访问需要注册管理员账户${NC}"
|
||||
echo ""
|
||||
|
||||
+5
-3
@@ -1,13 +1,15 @@
|
||||
## 🐳 Docker 版安装指南
|
||||
|
||||
> 推荐方式:一键脚本自动部署,无需手动编译,无需安装 Go 环境。
|
||||
> 推荐方式:一键脚本自动部署,无需手动编译,无需安装 Go 环境。</br>
|
||||
|
||||
> ⚠️ **注意**:Docker 版直接从源码构建,使用的是当前 `main` 分支的最新代码,更新进度会远快于 Release 版本。⚠️</br>
|
||||
> 如需使用特定版本(如 LTS),请查看 [Releases](https://git.whitetop.xyz/lxh2875931338/frpc-console/releases) 确认版本号,并通过二进制方式部署指定版本。
|
||||
|
||||
### 一、📥 前置条件
|
||||
|
||||
- 已安装 Docker(必须)
|
||||
- 已安装 curl / wget(脚本会自动检查并安装)
|
||||
- 操作系统:Linux(x86_64 / ARM64 均可,ARMv7 将在不久的未来得到支持)
|
||||
- 操作系统:Linux(x86_64 / ARM64 / ARMv7 均可)
|
||||
|
||||
|
||||
### 二、🚀 一键部署(推荐)
|
||||
@@ -130,7 +132,7 @@ docker run -d \
|
||||
--name frpc-console \
|
||||
--restart=always \
|
||||
--network host \
|
||||
-v /opt/frpc-console/data:/app/data \
|
||||
-v /opt/frpc-console/data:/app\
|
||||
-e PORT=9300 \
|
||||
-e TZ=Asia/Shanghai \
|
||||
frpc-console:latest
|
||||
|
||||
@@ -258,10 +258,7 @@ frpc-console 遵循 **“够用就好”** 的原则:
|
||||
|
||||
## 📝 更新日志
|
||||
|
||||
|
||||
## 📝 更新日志
|
||||
|
||||
####相关更新日志请查看[update-logs.md](https://git.whitetop.xyz/lxh2875931338/frpc-console/raw/main/update-logs.md)
|
||||
#### 相关更新日志请查看[update-logs.md](./update-logs.md)
|
||||
|
||||
---
|
||||
|
||||
|
||||
+1
-1
@@ -170,7 +170,7 @@ function filterProxies(list, keyword) {
|
||||
(p) =>
|
||||
p.name.toLowerCase().includes(kw) ||
|
||||
p.localIP.includes(kw) ||
|
||||
String(p.remotePort).includes(kw),
|
||||
String(p.remotePort).includes(kw)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user