mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-12 12:17:23 +00:00
fix(packaging): 包内 unit 指向 /usr/bin;core-dist 支持无 nfpm 打包
两个都是发布链上的真缺陷,构建 v3.0.0 产物时才暴露:
1. **unit 与包内二进制路径不一致**:deb/rpm 把二进制装到 `/usr/bin/modelrouter`,
而 `modelrouter.service` 的 `ExecStart` 写 `/usr/local/bin/modelrouter`。
装包后 `systemctl start` 只会给 203/EXEC,看起来像"装好了但起不来"。
- 包内 unit 改 `/usr/bin/modelrouter`(FHS,装包即用)
- 源码部署仍用 `/usr/local/bin`,`deploy.sh` 增加校验:unit 的 ExecStart
指向不存在的文件时**中止**并说明两种布局的区别
- docs/deployment.md 同步说明
2. **core-dist 硬依赖 nfpm**:构建机离线(GOPROXY 不可达)时装不上 nfpm,
发布直接被堵死。现在 nfpm 优先,缺失时回退 dpkg-deb + rpmbuild,
两者产出同一套文件布局,并继续由末尾的 archive-content 门禁校验。
- rpm 回退踩到的坑:postinst/prerm 末尾无换行时,`%preun` 会粘在
`exit 0` 后面,整个 `%files` 段被吞,rpmbuild 报
"Installed (but unpackaged) file(s) found"。
- `%dir /etc/modelrouter` 要求 buildroot 里存在该目录,否则
"Directory not found"。
验证:`./packaging/core-dist.sh 3.0.0` 产出 deb(4220KB)/rpm(4229KB)/tar(4145KB);
包内 unit `ExecStart=/usr/bin/modelrouter`,`systemd-analyze verify --root` 通过;
deb/rpm 均不含 `plugins/`,adapters=14。
This commit is contained in:
17
deploy.sh
17
deploy.sh
@ -115,6 +115,23 @@ precheck() {
|
|||||||
如需全新部署,先把旧目录移开:mv /etc/llmsproxy /etc/llmsproxy.bak"
|
如需全新部署,先把旧目录移开:mv /etc/llmsproxy /etc/llmsproxy.bak"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# unit 与二进制路径必须一致。包安装把二进制放 /usr/bin,源码部署放
|
||||||
|
# /usr/local/bin;unit 里写错一行,systemctl restart 只会给 203/EXEC,
|
||||||
|
# 看起来像"部署成功但服务起不来"。此处提前拦住。
|
||||||
|
local unit="/etc/systemd/system/modelrouter.service"
|
||||||
|
if [[ -f "$unit" ]]; then
|
||||||
|
local unit_exe
|
||||||
|
unit_exe=$(awk -F'=' '/^ExecStart=/{print $2; exit}' "$unit" | awk '{print $1}')
|
||||||
|
if [[ -n "$unit_exe" && "$unit_exe" != "$TARGET_BIN" && ! -x "$unit_exe" ]]; then
|
||||||
|
fail "unit 的 ExecStart 指向 $unit_exe,但该文件不存在。
|
||||||
|
包安装(deb/rpm)用 /usr/bin/modelrouter;源码部署(本脚本)用 $TARGET_BIN。
|
||||||
|
请把 $unit 的 ExecStart 改成 $TARGET_BIN,或改用包安装。"
|
||||||
|
fi
|
||||||
|
if [[ -n "$unit_exe" && "$unit_exe" != "$TARGET_BIN" ]]; then
|
||||||
|
warn "unit ExecStart=$unit_exe,而本脚本部署到 $TARGET_BIN(两者都存在,确认哪个该生效)"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -n "$NEW_CONFIG_SRC" ]]; then
|
if [[ -n "$NEW_CONFIG_SRC" ]]; then
|
||||||
[[ -f "$NEW_CONFIG_SRC" ]] || fail "待部署配置不存在: $NEW_CONFIG_SRC"
|
[[ -f "$NEW_CONFIG_SRC" ]] || fail "待部署配置不存在: $NEW_CONFIG_SRC"
|
||||||
# 同一文件比对:--config 指向线上文件本身时没有"投放"动作可做,
|
# 同一文件比对:--config 指向线上文件本身时没有"投放"动作可做,
|
||||||
|
|||||||
@ -16,9 +16,14 @@ sudo ./deploy.sh --config other.yaml # 投放并部署另一份配置
|
|||||||
|
|
||||||
部署目标(改名后):
|
部署目标(改名后):
|
||||||
|
|
||||||
| 项 | 路径 |
|
> 两种布局并存,区别只在于二进制位置:**包安装**(deb/rpm)放 `/usr/bin`,
|
||||||
|
> unit 自带;**源码部署**(`deploy.sh`)放 `/usr/local/bin`,需要让 unit 的
|
||||||
|
> `ExecStart` 指向它。`deploy.sh` 会校验这一点,写错时直接中止而不是留下
|
||||||
|
> 一个 203/EXEC 的服务。
|
||||||
|
|
||||||
|
| 项 | 路径(源码部署 / 包安装) |
|
||||||
|---|---|
|
|---|---|
|
||||||
| 二进制 | `/usr/local/bin/modelrouter` |
|
| 二进制 | `/usr/local/bin/modelrouter` / `/usr/bin/modelrouter` |
|
||||||
| 配置 | `/etc/modelrouter/config.yaml` |
|
| 配置 | `/etc/modelrouter/config.yaml` |
|
||||||
| 适配器 | `/etc/modelrouter/adapters/` |
|
| 适配器 | `/etc/modelrouter/adapters/` |
|
||||||
| 插件(可选) | `/etc/modelrouter/plugins/`(需在配置里设 `plugin_dir`) |
|
| 插件(可选) | `/etc/modelrouter/plugins/`(需在配置里设 `plugin_dir`) |
|
||||||
|
|||||||
@ -20,19 +20,122 @@ BUILD_BIN="$ROOT/cmd/build/modelrouter"
|
|||||||
|
|
||||||
log() { printf '\033[1;34m[core-dist]\033[0m %s\n' "$*"; }
|
log() { printf '\033[1;34m[core-dist]\033[0m %s\n' "$*"; }
|
||||||
|
|
||||||
# nfpm is installed via `go install` -> lives in GOPATH/bin, which may not be
|
# nfpm is the primary packager, but it is a `go install` artifact and the build
|
||||||
# on the caller's PATH (non-interactive shells, cron). Resolve it explicitly.
|
# host may be offline (no GOPROXY) — a release must not depend on being able to
|
||||||
|
# fetch it. Fall back to dpkg-deb / rpmbuild, which are present wherever the
|
||||||
|
# packages are actually verified. Both paths produce the same file layout.
|
||||||
NFPM_BIN="$(command -v nfpm || true)"
|
NFPM_BIN="$(command -v nfpm || true)"
|
||||||
[ -z "$NFPM_BIN" ] && [ -n "$(go env GOPATH)" ] && {
|
[ -z "$NFPM_BIN" ] && [ -n "$(go env GOPATH)" ] && {
|
||||||
[ -x "$(go env GOPATH)/bin/nfpm" ] && NFPM_BIN="$(go env GOPATH)/bin/nfpm"
|
[ -x "$(go env GOPATH)/bin/nfpm" ] && NFPM_BIN="$(go env GOPATH)/bin/nfpm"
|
||||||
}
|
}
|
||||||
[ -n "$NFPM_BIN" ] || {
|
if [ -n "$NFPM_BIN" ]; then
|
||||||
echo "[core-dist] nfpm missing. Install: go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.41.2"
|
log "packager: nfpm ($NFPM_BIN)"
|
||||||
exit 1
|
else
|
||||||
}
|
command -v dpkg-deb >/dev/null || { echo "[core-dist] neither nfpm nor dpkg-deb available"; exit 1; }
|
||||||
|
command -v rpmbuild >/dev/null || { echo "[core-dist] neither nfpm nor rpmbuild available"; exit 1; }
|
||||||
|
log "packager: nfpm missing -> dpkg-deb + rpmbuild fallback"
|
||||||
|
fi
|
||||||
|
|
||||||
mkdir -p "$DIST"
|
mkdir -p "$DIST"
|
||||||
|
|
||||||
|
# ---- fallback packagers -------------------------------------------------
|
||||||
|
# Same file layout as packaging/nfpm.yaml. Kept in this file (not a separate
|
||||||
|
# script) so the two paths cannot drift silently: both are exercised by the
|
||||||
|
# archive-content gate at the end.
|
||||||
|
package_deb_fallback() {
|
||||||
|
local root="$ROOT/cmd/build/pkgroot-deb"
|
||||||
|
rm -rf "$root"
|
||||||
|
mkdir -p "$root/DEBIAN" "$root/usr/bin" "$root/etc/systemd/system" \
|
||||||
|
"$root/usr/share/modelrouter/adapters" "$root/usr/share/doc/modelrouter"
|
||||||
|
install -m 0755 "$BUILD_BIN" "$root/usr/bin/modelrouter"
|
||||||
|
install -m 0644 "$ROOT/packaging/modelrouter.service" "$root/etc/systemd/system/modelrouter.service"
|
||||||
|
install -m 0644 "$ROOT/packaging/config.example.yaml" "$root/usr/share/modelrouter/config.example.yaml"
|
||||||
|
install -m 0644 "$ROOT"/internal/lua/adapters/*.lua "$root/usr/share/modelrouter/adapters/"
|
||||||
|
install -m 0755 "$ROOT/packaging/install-browser-stack.sh" "$root/usr/share/modelrouter/install-browser-stack.sh"
|
||||||
|
install -m 0644 "$ROOT/README.md" "$root/usr/share/doc/modelrouter/README.md"
|
||||||
|
install -m 0755 "$ROOT/packaging/postinst.sh" "$root/DEBIAN/postinst"
|
||||||
|
install -m 0755 "$ROOT/packaging/prerm.sh" "$root/DEBIAN/prerm"
|
||||||
|
local inst_size
|
||||||
|
inst_size=$(du -sk "$root" | awk '{print $1}')
|
||||||
|
cat > "$root/DEBIAN/control" <<EOF
|
||||||
|
Package: modelrouter
|
||||||
|
Version: $VERSION
|
||||||
|
Section: net
|
||||||
|
Priority: optional
|
||||||
|
Architecture: amd64
|
||||||
|
Installed-Size: $inst_size
|
||||||
|
Maintainer: JianFeeeee <dev@modelrouter.local>
|
||||||
|
Recommends: ca-certificates
|
||||||
|
Homepage: https://gitcode.com/JianFeeeee/ModelRouter
|
||||||
|
Description: Unified OpenAI-compatible multi-source LLM gateway.
|
||||||
|
Routes requests across multiple upstream LLM providers with Lua adapters,
|
||||||
|
model scheduling, quota windows, an elastic Lua worker pool, and a Web UI.
|
||||||
|
EOF
|
||||||
|
dpkg-deb --root-owner-group -Zgzip --build "$root" \
|
||||||
|
"$DIST/modelrouter_${VERSION}_amd64.deb" >/dev/null
|
||||||
|
log " built $(basename "$DIST/modelrouter_${VERSION}_amd64.deb")"
|
||||||
|
}
|
||||||
|
|
||||||
|
package_rpm_fallback() {
|
||||||
|
local top="$ROOT/cmd/build/rpmbuild"
|
||||||
|
rm -rf "$top"
|
||||||
|
mkdir -p "$top"/{BUILD,RPMS,SOURCES,SPECS,BUILDROOT}
|
||||||
|
local spec="$top/SPECS/modelrouter.spec"
|
||||||
|
{
|
||||||
|
cat <<EOF
|
||||||
|
Name: modelrouter
|
||||||
|
Version: $VERSION
|
||||||
|
Release: 1
|
||||||
|
Summary: Unified OpenAI-compatible multi-source LLM gateway
|
||||||
|
License: MIT
|
||||||
|
URL: https://gitcode.com/JianFeeeee/ModelRouter
|
||||||
|
BuildArch: x86_64
|
||||||
|
Requires: ca-certificates
|
||||||
|
AutoReqProv: no
|
||||||
|
%description
|
||||||
|
Unified OpenAI-compatible multi-source LLM gateway. Routes requests across
|
||||||
|
multiple upstream LLM providers with Lua adapters, model scheduling, quota
|
||||||
|
windows, an elastic Lua worker pool, and a Web UI.
|
||||||
|
%install
|
||||||
|
mkdir -p %{buildroot}/usr/bin %{buildroot}/etc/systemd/system \\
|
||||||
|
%{buildroot}/usr/share/modelrouter/adapters \\
|
||||||
|
%{buildroot}/usr/share/doc/modelrouter %{buildroot}/etc/modelrouter
|
||||||
|
install -m 0755 $BUILD_BIN %{buildroot}/usr/bin/modelrouter
|
||||||
|
install -m 0644 $ROOT/packaging/modelrouter.service %{buildroot}/etc/systemd/system/modelrouter.service
|
||||||
|
install -m 0644 $ROOT/packaging/config.example.yaml %{buildroot}/usr/share/modelrouter/config.example.yaml
|
||||||
|
install -m 0644 $ROOT/internal/lua/adapters/*.lua %{buildroot}/usr/share/modelrouter/adapters/
|
||||||
|
install -m 0755 $ROOT/packaging/install-browser-stack.sh %{buildroot}/usr/share/modelrouter/install-browser-stack.sh
|
||||||
|
install -m 0644 $ROOT/README.md %{buildroot}/usr/share/doc/modelrouter/README.md
|
||||||
|
%post
|
||||||
|
EOF
|
||||||
|
sed '1{/^#!/d}' "$ROOT/packaging/postinst.sh"
|
||||||
|
# Script files may lack a trailing newline. Without this, `%preun` is glued
|
||||||
|
# onto the last line of %post and the whole %files section is swallowed —
|
||||||
|
# rpmbuild then fails with "Installed (but unpackaged) file(s) found".
|
||||||
|
echo
|
||||||
|
echo '%preun'
|
||||||
|
sed '1{/^#!/d}' "$ROOT/packaging/prerm.sh"
|
||||||
|
echo
|
||||||
|
cat <<'EOF'
|
||||||
|
%files
|
||||||
|
/usr/bin/modelrouter
|
||||||
|
/etc/systemd/system/modelrouter.service
|
||||||
|
/usr/share/modelrouter
|
||||||
|
/usr/share/doc/modelrouter/README.md
|
||||||
|
%dir /etc/modelrouter
|
||||||
|
EOF
|
||||||
|
} > "$spec"
|
||||||
|
rpmbuild --define "_topdir $top" --define "_binary_payload w9.gzdio" -bb "$spec" \
|
||||||
|
>/dev/null 2>&1 || {
|
||||||
|
echo "[core-dist] FATAL: rpmbuild failed; spec kept at $spec"; exit 1
|
||||||
|
}
|
||||||
|
local built
|
||||||
|
built=$(find "$top/RPMS" -name 'modelrouter-*.rpm' | head -1)
|
||||||
|
[ -n "$built" ] || { echo "[core-dist] FATAL: rpmbuild produced no rpm"; exit 1; }
|
||||||
|
cp "$built" "$DIST/modelrouter-${VERSION}.x86_64.rpm"
|
||||||
|
log " built $(basename "$DIST/modelrouter-${VERSION}.x86_64.rpm")"
|
||||||
|
}
|
||||||
|
|
||||||
# 1) build the core binary (luajit tag, -s -w like deploy.sh)
|
# 1) build the core binary (luajit tag, -s -w like deploy.sh)
|
||||||
log "building core binary (luajit, stripped)..."
|
log "building core binary (luajit, stripped)..."
|
||||||
CGO_ENABLED=1 go build -tags luajit -trimpath -ldflags="-s -w" -o "$BUILD_BIN" ./cmd/modelrouter
|
CGO_ENABLED=1 go build -tags luajit -trimpath -ldflags="-s -w" -o "$BUILD_BIN" ./cmd/modelrouter
|
||||||
@ -58,10 +161,15 @@ log " ok: $(stat -c%s "$BUILD_BIN") bytes, symbols present"
|
|||||||
# stamp the version into a throwaway copy of the config; -t places the
|
# stamp the version into a throwaway copy of the config; -t places the
|
||||||
# generated package in the dist dir.
|
# generated package in the dist dir.
|
||||||
log "packaging deb + rpm (v$VERSION)..."
|
log "packaging deb + rpm (v$VERSION)..."
|
||||||
NFPM_CFG="$(mktemp)" && sed "s/__VERSION__/$VERSION/g" "$ROOT/packaging/nfpm.yaml" > "$NFPM_CFG"
|
if [ -n "$NFPM_BIN" ]; then
|
||||||
"$NFPM_BIN" package --config "$NFPM_CFG" --packager deb -t "$DIST"
|
NFPM_CFG="$(mktemp)" && sed "s/__VERSION__/$VERSION/g" "$ROOT/packaging/nfpm.yaml" > "$NFPM_CFG"
|
||||||
"$NFPM_BIN" package --config "$NFPM_CFG" --packager rpm -t "$DIST"
|
"$NFPM_BIN" package --config "$NFPM_CFG" --packager deb -t "$DIST"
|
||||||
rm -f "$NFPM_CFG"
|
"$NFPM_BIN" package --config "$NFPM_CFG" --packager rpm -t "$DIST"
|
||||||
|
rm -f "$NFPM_CFG"
|
||||||
|
else
|
||||||
|
package_deb_fallback
|
||||||
|
package_rpm_fallback
|
||||||
|
fi
|
||||||
|
|
||||||
# 4) tar.gz
|
# 4) tar.gz
|
||||||
log "packaging tar.gz..."
|
log "packaging tar.gz..."
|
||||||
|
|||||||
@ -15,7 +15,10 @@ Type=simple
|
|||||||
# the extra GC cycles are free.
|
# the extra GC cycles are free.
|
||||||
Environment=GOGC=50
|
Environment=GOGC=50
|
||||||
Environment=MALLOC_ARENA_MAX=2
|
Environment=MALLOC_ARENA_MAX=2
|
||||||
ExecStart=/usr/local/bin/modelrouter -config /etc/modelrouter/config.yaml
|
# Package installs put the binary in /usr/bin (FHS). A source deployment via
|
||||||
|
# deploy.sh uses /usr/local/bin — that script verifies the unit below points at
|
||||||
|
# a binary that actually exists, so the two layouts cannot silently disagree.
|
||||||
|
ExecStart=/usr/bin/modelrouter -config /etc/modelrouter/config.yaml
|
||||||
WorkingDirectory=/etc/modelrouter
|
WorkingDirectory=/etc/modelrouter
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|||||||
Reference in New Issue
Block a user