agent 自身的三件套(py/log/pid + token)原本散在 $HOME 根目录,跟
~/ipass/{data,backup,audit} 不是一个根,运维一眼看不到。
ipass-agent.py:
* 新增 INSTALL_DIR/TOKEN_FILE/PID_FILE/LOG_FILE 四个常量
* load_token()/main() 用常量替代 hardcoded os.path.join(~, ...)
* 文档注释同步路径
deploy/migrate-agent-home.sh (新):
* 一次性迁移:停旧 agent → mv 文件到 ~/ipass/ → 启新 agent
* 旧日志 gzip 归档到 ~/ipass/ipass-agent.log.old.gz
* 旧位置残留检查,避免漏删
* 仅做一次:commit 之后 git pull + restart 即可
deploy/update-agent-face.sh:
* 注释里的 ~/.ipass-agent-token / ~/ipass-agent.log 同步新路径
deploy/release.sh:
* §12.5 指引里的 ~/.ipass-agent-token 同步新路径
CLAUDE.md:
* 控制面 §12.5 的 ipass-agent.py CLI 示例同步新路径
89 lines
3.3 KiB
Bash
Executable File
89 lines
3.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# ---------------------------------------------------------------------------
|
||
# iPass 镜像发版:构建 → 打 tag → 推送阿里云 CR
|
||
#
|
||
# 约定(重要):**tag 只增不改**
|
||
# 对外 tag 形如 `ipass-1.0.0` / `ipass-1.0.1` / `ipass-1.0.2` ……
|
||
# 每有一次代码变更就 +1 推新 tag,**绝不覆盖已推送过的 tag**。
|
||
# 理由:同名 tag 覆盖后,`docker pull` 拿到的内容与本地缓存/回滚标签对不上,
|
||
# 回滚会选错镜像,而且没法从 tag 判断线上到底跑的是哪一版。
|
||
#
|
||
# 用法:
|
||
# bash deploy/release.sh 1.0.2 # → .../ssw188/nginx:ipass-1.0.2
|
||
# bash deploy/release.sh ipass-1.0.2 # 写全也可以
|
||
# DRY_RUN=1 bash deploy/release.sh 1.0.2 # 只构建不推送
|
||
# ---------------------------------------------------------------------------
|
||
set -euo pipefail
|
||
|
||
REGISTRY="${REGISTRY:-crpi-yscq976uwza88qap.cn-shenzhen.personal.cr.aliyuncs.com}"
|
||
REPO="${REPO:-ssw188/nginx}"
|
||
PREFIX="${PREFIX:-ipass-}"
|
||
|
||
TAG="${1:-}"
|
||
if [ -z "$TAG" ]; then
|
||
echo "用法: bash deploy/release.sh <tag>"
|
||
echo " 例: bash deploy/release.sh 1.0.2 → $REGISTRY/$REPO:${PREFIX}1.0.2"
|
||
echo
|
||
echo "远端已有的 ${PREFIX}* tag(示例命令,需先 docker login):"
|
||
echo " docker images --format '{{.Repository}}:{{.Tag}}' | grep ${PREFIX} || true"
|
||
exit 2
|
||
fi
|
||
case "$TAG" in
|
||
"$PREFIX"*) ;;
|
||
*) TAG="${PREFIX}${TAG}" ;;
|
||
esac
|
||
|
||
IMAGE="$REGISTRY/$REPO:$TAG"
|
||
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||
cd "$ROOT"
|
||
|
||
# --- 0) 工作区必须干净:tag 必须能对应到一个 commit ------------------------
|
||
if [ -n "$(git status --porcelain)" ]; then
|
||
echo "✗ 工作区有未提交改动 —— 先提交再发版(否则 tag 与源码对不上)"
|
||
git status --short
|
||
exit 1
|
||
fi
|
||
COMMIT="$(git rev-parse --short HEAD)"
|
||
|
||
# --- 1) tag 只增不改:远端已有同名 tag 直接拒绝 ------------------------------
|
||
if docker manifest inspect "$IMAGE" >/dev/null 2>&1; then
|
||
echo "✗ 远端已存在 $IMAGE"
|
||
echo " 按约定 tag 只增不改 —— 请换更大的号(如 ${PREFIX}1.0.$(( ${TAG##*.} + 1 )))"
|
||
exit 1
|
||
else
|
||
echo "· 远端未见 ${IMAGE}(或无法查询,继续构建)"
|
||
fi
|
||
|
||
# --- 2) 构建 ---------------------------------------------------------------
|
||
# 本机(OrbStack)必须用经典构建器:buildx 写 activity 会被沙箱拦 rename。
|
||
echo "→ 构建中(commit ${COMMIT})"
|
||
DOCKER_BUILDKIT=0 docker build -t "$IMAGE" "$ROOT"
|
||
ID="$(docker image inspect --format '{{.Id}}' "$IMAGE")"
|
||
echo " 镜像 id: $ID"
|
||
|
||
# --- 3) 推送 ---------------------------------------------------------------
|
||
if [ "${DRY_RUN:-0}" = "1" ]; then
|
||
echo "· DRY_RUN=1 —— 跳过推送。要推: docker push $IMAGE"
|
||
exit 0
|
||
fi
|
||
|
||
echo "→ 推送 $IMAGE"
|
||
docker push "$IMAGE"
|
||
|
||
# --- 4) 收尾:打印下一步(远程更新命令) ------------------------------------
|
||
cat <<EOF
|
||
|
||
✓ 发版完成
|
||
tag : $TAG
|
||
image : $IMAGE
|
||
commit : $COMMIT
|
||
image id: $ID
|
||
|
||
在 .11 上更新(控制面 §12.5;把 <token> 换成 ~/ipass/.ipass-agent-token 的内容):
|
||
|
||
A=http://192.168.1.11:18099; T='Authorization: Bearer <token>'
|
||
curl -s -H "\$T" -H 'Content-Type: application/json' \\
|
||
-d '{"image":"$IMAGE"}' \$A/update # 返回 job id
|
||
curl -s -H "\$T" \$A/jobs/<job-id>?offset=0 # 增量取日志,看 7 步是否全过
|
||
EOF
|