build: allinone revert

Author: XiaJunjie2020

Dockerfile

@@ -45,8 +45,6 @@ COPY g2-ssr/charts/* /app/charts/
 
 RUN npm install
 
-FROM registry.cn-qingdao.aliyuncs.com/dataease/postgres:17.6 AS pg-builder
-
 # Runtime stage
 FROM registry.cn-qingdao.aliyuncs.com/dataease/sqlbot-base:latest
 
@@ -56,12 +54,6 @@ ENV SQLBOT_HOME=/opt/sqlbot
 ENV PYTHONPATH=${SQLBOT_HOME}/app
 ENV PATH="${SQLBOT_HOME}/app/.venv/bin:$PATH"
 
-ENV PG_PATH=/var/lib/postgresql/data
-ENV PG_SH=/usr/local/bin
-RUN mkdir -p ${PG_PATH}
-COPY --from=pg-builder ${PG_PATH} ${PG_PATH}
-COPY --from=pg-builder ${PG_SH} ${PG_SH}
-
 # Copy necessary files from builder
 COPY start.sh /opt/sqlbot/app/start.sh
 COPY g2-ssr/*.ttf /usr/share/fonts/truetype/liberation/

installer/install.conf

@@ -9,7 +9,7 @@ SQLBOT_MCP_PORT=8001
 ## 是否使用外部数据库
 SQLBOT_EXTERNAL_DB=false
 ## 数据库地址
-SQLBOT_DB_HOST=localhost
+SQLBOT_DB_HOST=sqlbot-db
 ## 数据库端口 (仅使用外部数据库时才生效)
 SQLBOT_DB_PORT=5432
 ## SQLBot 数据库库名

installer/sqlbot/docker-compose.yml

@@ -8,14 +8,12 @@ services:
     ports:
       - ${SQLBOT_WEB_PORT}:8000
       - ${SQLBOT_MCP_PORT}:8001
-      - 5432:5432
     env_file:
       - conf/sqlbot.conf
     volumes:
       - ./data/sqlbot/excel:/opt/sqlbot/data/excel
       - ./data/sqlbot/images:/opt/sqlbot/images
       - ./data/sqlbot/logs:/opt/sqlbot/logs
-      - ./data/postgresql:/var/lib/postgresql/data
     depends_on:
       sqlbot-db:
         condition: service_healthy

start.sh

@@ -1,6 +1,5 @@
 SSR_PATH=/opt/sqlbot/g2-ssr
 APP_PATH=/opt/sqlbot/app
-docker-entrypoint.sh postgres
 nohup node $SSR_PATH/app.js &
 
 nohup uvicorn main:mcp_app --host 0.0.0.0 --port 8001 &