之前 entrypoint 第 15 行硬编码 'if -d /data/pg then PGDATA=/data/pg', 会强制覆盖用户通过 docker run -e PGDATA=/your/path 传的值。 修复:优先级 '用户显式传 > /data/pg 挂载 > 默认匿名卷'。 判断标准 '非 Dockerfile 默认值'(避免空传被误判)。 新增 README 段说明用法: - 'docker run -e PGDATA=/var/lib/postgresql/data/myapp' 让数据存到指定子目录 - 或 '-v ~/pgdata:/var/lib/postgresql/data' 挂宿主卷到默认数据目录 镜像 digest: sha256:10a83c68aa30f9a1f6cc2805952339554ddca732a9eed7db0b5bdabcdac4b7c0 - 1 个新 layer pushed(仅 entrypoint.sh 改动) - 端到端验证 -e PGDATA=/var/lib/postgresql/data/myapp → entrypoint 日志显示 'user-specified via -e' + healthy ✓
82 lines
3.4 KiB
Bash
Executable File
82 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
# 尚数网本体管理平台 · 单镜像 entrypoint
|
|
#
|
|
# 设计要点:
|
|
# 1. 用户挂 -v /host/x:/data 时: /data/pg -> PG 数据; /data/archive -> 文档
|
|
# 2. 不挂: PG 用匿名卷 (不持久化), archive 用镜像内自带目录
|
|
# 3. PG 用官方 docker-entrypoint.sh 初始化 (用户/库/权限都由它管)
|
|
# 4. ontology exec 成 PID 1 (接 SIGTERM 优雅退出), PG 在后台, trap 保证一起收
|
|
set -eu
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# 1. 数据目录决策(优先级:用户显式传 > /data/pg 挂载 > 默认匿名卷)
|
|
# ----------------------------------------------------------------------------
|
|
# 用户显式传 PGDATA(且不是 Dockerfile 默认值) -> 尊重用户,不被 /data/pg 覆盖
|
|
if [ -n "${PGDATA:-}" ] && [ "${PGDATA}" != "/var/lib/postgresql/data" ]; then
|
|
echo "[entrypoint] PGDATA=$PGDATA (user-specified via -e)"
|
|
# 典型场景:挂载 /data/pg 让 PG 数据持久化
|
|
elif [ -d /data ] && [ -d /data/pg ]; then
|
|
export PGDATA=/data/pg
|
|
echo "[entrypoint] PGDATA=/data/pg (mounted /data/pg)"
|
|
# 兜底:不挂任何卷,PG 用镜像内匿名卷(不持久化,重启数据丢)
|
|
else
|
|
export PGDATA=/var/lib/postgresql/data
|
|
echo "[entrypoint] PGDATA=/var/lib/postgresql/data (anonymous)"
|
|
fi
|
|
|
|
# /data/archive 存在 -> 软链到 /app/archive, 让 ontology 写入透明生效
|
|
if [ -d /data ] && [ -d /data/archive ]; then
|
|
rm -rf /app/archive
|
|
ln -sfn /data/archive /app/archive
|
|
echo "[entrypoint] archive -> /data/archive (mounted)"
|
|
else
|
|
mkdir -p /app/archive
|
|
echo "[entrypoint] archive -> /app/archive (ephemeral)"
|
|
fi
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# 2. 启动 Postgres (用官方 entrypoint 完成 initdb/建用户/建库等)
|
|
# ----------------------------------------------------------------------------
|
|
echo "[entrypoint] starting postgres..."
|
|
/usr/local/bin/docker-entrypoint.sh postgres &
|
|
PG_PID=$!
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# 3. 等 PG 就绪 (最多 60s)
|
|
# ----------------------------------------------------------------------------
|
|
echo "[entrypoint] waiting for postgres at 127.0.0.1:5432..."
|
|
READY=no
|
|
for i in $(seq 1 60); do
|
|
if pg_isready -h 127.0.0.1 -p 5432 \
|
|
-U "${POSTGRES_USER:-ssw}" \
|
|
-d "${POSTGRES_DB:-ssw-ontology}" -q 2>/dev/null; then
|
|
READY=yes
|
|
break
|
|
fi
|
|
sleep 1
|
|
done
|
|
|
|
if [ "$READY" != "yes" ]; then
|
|
echo "[entrypoint] FATAL: postgres not ready after 60s, dumping logs..."
|
|
kill -TERM "$PG_PID" 2>/dev/null || true
|
|
wait "$PG_PID" 2>/dev/null || true
|
|
exit 1
|
|
fi
|
|
echo "[entrypoint] postgres ready (db=${POSTGRES_DB:-ssw-ontology})"
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# 4. trap: ontology 退出时, 顺手把 PG 也带走 (避免孤儿进程)
|
|
# ----------------------------------------------------------------------------
|
|
cleanup() {
|
|
echo "[entrypoint] stopping postgres (pid=$PG_PID)..."
|
|
kill -TERM "$PG_PID" 2>/dev/null || true
|
|
wait "$PG_PID" 2>/dev/null || true
|
|
}
|
|
trap cleanup EXIT TERM INT
|
|
|
|
# ----------------------------------------------------------------------------
|
|
# 5. 前台启动 ontology (exec -> 它就是 PID 1, 接收 docker stop 的 SIGTERM)
|
|
# ----------------------------------------------------------------------------
|
|
echo "[entrypoint] starting ontology on :${HTTP_PORT:-8081}..."
|
|
exec /app/server
|