mirror of
https://gh-proxy.org/https://github.com/klinsmaya/SQLBot.git
synced 2026-11-09 01:36:57 +08:00
build: Replace pm2 with Supervisor
This commit is contained in:
+5
-1
@@ -67,6 +67,9 @@ RUN npm install
|
|||||||
# Runtime stage
|
# Runtime stage
|
||||||
FROM registry.cn-qingdao.aliyuncs.com/dataease/sqlbot-python-pg:latest
|
FROM registry.cn-qingdao.aliyuncs.com/dataease/sqlbot-python-pg:latest
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends supervisor \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
|
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
|
||||||
echo "Asia/Shanghai" > /etc/timezone
|
echo "Asia/Shanghai" > /etc/timezone
|
||||||
|
|
||||||
@@ -85,11 +88,12 @@ COPY start.sh /opt/sqlbot/app/start.sh
|
|||||||
COPY g2-ssr/*.ttf /usr/share/fonts/truetype/liberation/
|
COPY g2-ssr/*.ttf /usr/share/fonts/truetype/liberation/
|
||||||
COPY --from=sqlbot-builder ${SQLBOT_HOME} ${SQLBOT_HOME}
|
COPY --from=sqlbot-builder ${SQLBOT_HOME} ${SQLBOT_HOME}
|
||||||
COPY --from=ssr-builder /app /opt/sqlbot/g2-ssr
|
COPY --from=ssr-builder /app /opt/sqlbot/g2-ssr
|
||||||
|
COPY g2-ssr/supervisord.conf /etc/supervisor/conf.d/g2-ssr.conf
|
||||||
COPY --from=vector-model /opt/maxkb/app/model /opt/sqlbot/models
|
COPY --from=vector-model /opt/maxkb/app/model /opt/sqlbot/models
|
||||||
|
|
||||||
WORKDIR ${SQLBOT_HOME}/app
|
WORKDIR ${SQLBOT_HOME}/app
|
||||||
|
|
||||||
RUN mkdir -p /opt/sqlbot/images /opt/sqlbot/g2-ssr
|
RUN mkdir -p /opt/sqlbot/images /opt/sqlbot/g2-ssr/logs
|
||||||
|
|
||||||
EXPOSE 3000 8000 8001 5432
|
EXPOSE 3000 8000 8001 5432
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
apps: [
|
|
||||||
{
|
|
||||||
name: "app",
|
|
||||||
script: "./app.js",
|
|
||||||
// 自动重启选项
|
|
||||||
autorestart: true, // 启用自动重启
|
|
||||||
restart_delay: 5000, // 重启延迟(毫秒)
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
@@ -8,7 +8,6 @@
|
|||||||
"@rollup/plugin-json": "^6.1.0",
|
"@rollup/plugin-json": "^6.1.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"nan": "^2.22.2",
|
"nan": "^2.22.2",
|
||||||
"pm2": "^6.0.13",
|
|
||||||
"node-canvas": "^2.9.0",
|
"node-canvas": "^2.9.0",
|
||||||
"nprogress": "^0.2.0"
|
"nprogress": "^0.2.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
[program:g2-ssr]
|
||||||
|
command=node /opt/sqlbot/g2-ssr/app.js
|
||||||
|
directory=/opt/sqlbot/g2-ssr
|
||||||
|
autostart=true
|
||||||
|
autorestart=true
|
||||||
|
startsecs=1
|
||||||
|
startretries=10
|
||||||
|
redirect_stderr=true
|
||||||
|
stdout_logfile=/opt/sqlbot/g2-ssr/logs/supervisor_stdout.log
|
||||||
|
stderr_logfile=/opt/sqlbot/g2-ssr/logs/supervisor_stderr.log
|
||||||
|
stopasgroup=true
|
||||||
@@ -1,13 +1,11 @@
|
|||||||
SSR_PATH=/opt/sqlbot/g2-ssr
|
SSR_PATH=/opt/sqlbot/g2-ssr
|
||||||
APP_PATH=/opt/sqlbot/app
|
APP_PATH=/opt/sqlbot/app
|
||||||
PM2_CMD_PATH=$SSR_PATH/node_modules/pm2/bin/pm2
|
|
||||||
|
|
||||||
/usr/local/bin/docker-entrypoint.sh postgres &
|
/usr/local/bin/docker-entrypoint.sh postgres &
|
||||||
sleep 5
|
sleep 5
|
||||||
wait-for-it 127.0.0.1:5432 --timeout=120 --strict -- echo -e "\033[1;32mPostgreSQL started.\033[0m"
|
wait-for-it 127.0.0.1:5432 --timeout=120 --strict -- echo -e "\033[1;32mPostgreSQL started.\033[0m"
|
||||||
|
|
||||||
nohup $PM2_CMD_PATH start $SSR_PATH/app.js &
|
nohup /usr/bin/supervisord -c /etc/supervisor/supervisord.conf &
|
||||||
#nohup node $SSR_PATH/app.js &
|
|
||||||
|
|
||||||
nohup uvicorn main:mcp_app --host 0.0.0.0 --port 8001 --proxy-headers --forwarded-allow-ips='*' &
|
nohup uvicorn main:mcp_app --host 0.0.0.0 --port 8001 --proxy-headers --forwarded-allow-ips='*' &
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user