chore: sync fnOS package with Havline 2.0.0

This commit is contained in:
2026-10-24 16:57:35 +08:00
parent e749c2afaf
commit ad7c033342
3 changed files with 17 additions and 6 deletions
+2 -2
View File
@@ -46,9 +46,9 @@ image: havline:${TRIM_APPVER}
pull_policy: never pull_policy: never
``` ```
因此安装时不需要访问 `jayhub.top`,也不需要配置 Registry 登录。 因此安装时不需要访问外部镜像仓库(GitHub Container Registry),也不需要配置 Registry 登录。
当前 1.9.0 双架构 `.fpk` 约 `150.6 MB`。 当前 2.0.0 双架构 `.fpk` 约 `150 MB`(以实际构建产物为准)。
## 打包 ## 打包
+12 -1
View File
@@ -1,4 +1,4 @@
param( param(
[string]$FnpackPath = "", [string]$FnpackPath = "",
[switch]$SkipImageExport [switch]$SkipImageExport
) )
@@ -85,6 +85,17 @@ if (-not (Test-Path -LiteralPath $project)) {
throw "找不到飞牛应用工程:$project" throw "找不到飞牛应用工程:$project"
} }
# 版本一致性校验:Docker 版离线镜像标签为 havline:<主仓 VERSION>,
# 而容器运行时按 ${TRIM_APPVER}=manifest.version 加载镜像,两者必须严格一致。
$manifestVersion = ([regex]::Match((Get-Content -Raw (Join-Path $project "manifest")), '(?m)^version\s*=\s*(\S+)')).Groups[1].Value
if (-not $manifestVersion) {
throw "Docker manifest 缺少 version 字段:$(Join-Path $project 'manifest')"
}
Write-Output "App version: $version; Manifest version: $manifestVersion"
if ($manifestVersion -ne $version) {
throw "版本不一致:主仓 VERSION=$version,Docker manifest=$manifestVersion。镜像标签与运行时加载版本不匹配,请先将 fnos\havline\manifest 的 version 同步为主仓 VERSION。"
}
if (-not $FnpackPath) { if (-not $FnpackPath) {
$localTool = Join-Path $PSScriptRoot "fnpack.exe" $localTool = Join-Path $PSScriptRoot "fnpack.exe"
$FnpackPath = if (Test-Path -LiteralPath $localTool) { $localTool } else { "fnpack" } $FnpackPath = if (Test-Path -LiteralPath $localTool) { $localTool } else { "fnpack" }
+3 -3
View File
@@ -1,14 +1,14 @@
appname = havline appname = havline
version = 1.9.0 version = 2.0.0
display_name = Havline display_name = Havline
desc = NAS 公网访问管理:反向代理、DDNS、HTTPS 证书、FRP、Cloudflare Tunnel 与一键升级 desc = NAS 公网访问管理:反向代理、DDNS、HTTPS 证书、FRP、Cloudflare Tunnel 与一键升级
platform = all platform = all
source = thirdparty source = thirdparty
maintainer = Havline maintainer = Havline
maintainer_url = https://jayhub.top/mrlee/Havline maintainer_url = https://github.com/mrlee233/havline
distributor = Havline distributor = Havline
desktop_uidir = ui desktop_uidir = ui
desktop_applaunchname = havline.main desktop_applaunchname = havline.main
checkport = false checkport = false
ctl_stop = true ctl_stop = true
changelog = 离线镜像安装:不依赖外部仓库,同时支持 amd64 与 arm64 changelog = 2.0.0:同步主仓 2.0.0;新增内置 SSH 终端(二次认证、会话审计、录像与常用命令)、DDNS 服务商名称与自定义 IP、公网反代默认转发 WebSocket 升级头;离线镜像安装,不依赖外部仓库,同时支持 amd64 与 arm64