From 295eb88947f506d074fa8bce0b08856fd4c575d9 Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Tue, 1 Jul 2025 16:01:49 +0800 Subject: [PATCH] build: update sh files. --- installer/start-all.sh | 16 +++++++++++++++- installer/start-maxkb.sh | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/installer/start-all.sh b/installer/start-all.sh index fde7ddc28..3614489f2 100644 --- a/installer/start-all.sh +++ b/installer/start-all.sh @@ -2,9 +2,17 @@ set -e +if [ -f "/var/lib/postgresql/data/PG_VERSION" ]; then + # 如果是v1版本一键安装的的目录则退出 + echo "The existing data is from v1 and is not compatible with v2, installing v2 over v1 is not supported." + echo "The process will now exit." + exit 1 +fi + if [ "$MAXKB_DB_HOST" = "127.0.0.1" ]; then echo "PostgreSQL starting..." /usr/bin/start-postgres.sh & + postgres_pid=$! sleep 10 wait-for-it 127.0.0.1:5432 --timeout=120 --strict -- echo "PostgreSQL started." fi @@ -12,8 +20,14 @@ fi if [ "$MAXKB_REDIS_HOST" = "127.0.0.1" ]; then echo "Redis starting..." /usr/bin/start-redis.sh & + redis_pid=$! sleep 5 wait-for-it 127.0.0.1:6379 --timeout=60 --strict -- echo "Redis started." fi -/usr/bin/start-maxkb.sh \ No newline at end of file +/usr/bin/start-maxkb.sh & +maxkb_pid=$! + +wait -n +kill $postgres_pid $redis_pid $maxkb_pid 2>/dev/null +wait \ No newline at end of file diff --git a/installer/start-maxkb.sh b/installer/start-maxkb.sh index 07c06d4ef..150d2fd4a 100644 --- a/installer/start-maxkb.sh +++ b/installer/start-maxkb.sh @@ -4,4 +4,5 @@ mkdir -p /opt/maxkb/logs mkdir -p /opt/maxkb/local mkdir -p /opt/maxkb/python-packages +rm -f /opt/maxkb-app/tmp/*.pid python /opt/maxkb-app/main.py start \ No newline at end of file