From 3adf31264cbeceaace600384cdea2b0c40f4bd52 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 4 Sep 2025 13:51:26 +0800
Subject: [PATCH] build: allinone

---
 Dockerfile                             | 10 ++++------
 backend/common/core/config.py          |  2 +-
 installer/install.conf                 | 14 --------------
 installer/sqlbot/templates/sqlbot.conf |  7 -------
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 930b6350..0926cfb7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
    uv sync --extra cpu
 
 # Build g2-ssr
-FROM registry.cn-qingdao.aliyuncs.com/dataease/sqlbot-base:latest AS ssr-builder
+FROM registry.cn-qingdao.aliyuncs.com/dataease/sqlbot-python-pg:latest AS ssr-builder
 
 WORKDIR /app
 
@@ -54,11 +54,9 @@ ENV SQLBOT_HOME=/opt/sqlbot
 ENV PYTHONPATH=${SQLBOT_HOME}/app
 ENV PATH="${SQLBOT_HOME}/app/.venv/bin:$PATH"
 
-# ENV POSTGRES_SERVER=localhost
-# ENV POSTGRES_PORT=5432
-# ENV POSTGRES_DB=sqlbot
-# ENV POSTGRES_USER=root
-# ENV POSTGRES_PASSWORD=Password123@pg
+ENV POSTGRES_DB=sqlbot
+ENV POSTGRES_USER=root
+ENV POSTGRES_PASSWORD=Password123@pg
 
 # Copy necessary files from builder
 COPY start.sh /opt/sqlbot/app/start.sh
diff --git a/backend/common/core/config.py b/backend/common/core/config.py
index 920ee73f..ac0eb8d7 100644
--- a/backend/common/core/config.py
+++ b/backend/common/core/config.py
@@ -47,7 +47,7 @@ class Settings(BaseSettings):
     POSTGRES_SERVER: str = 'localhost'
     POSTGRES_PORT: int = 5432
     POSTGRES_USER: str = 'root'
-    POSTGRES_PASSWORD: str = "123456"
+    POSTGRES_PASSWORD: str = "Password123@pg"
     POSTGRES_DB: str = "sqlbot"
     SQLBOT_DB_URL: str = ''
     # SQLBOT_DB_URL: str = 'mysql+pymysql://root:Password123%40mysql@127.0.0.1:3306/sqlbot'
diff --git a/installer/install.conf b/installer/install.conf
index 7aaaabee..53211023 100644
--- a/installer/install.conf
+++ b/installer/install.conf
@@ -5,20 +5,6 @@ SQLBOT_BASE=/opt
 SQLBOT_WEB_PORT=8000
 SQLBOT_MCP_PORT=8001
 
-# 数据库配置
-## 是否使用外部数据库
-SQLBOT_EXTERNAL_DB=false
-## 数据库地址
-SQLBOT_DB_HOST=localhost
-## 数据库端口 (仅使用外部数据库时才生效)
-SQLBOT_DB_PORT=5432
-## SQLBot 数据库库名
-SQLBOT_DB_DB=sqlbot
-## 数据库用户名
-SQLBOT_DB_USER=root
-## 数据库密码，密码如包含特殊字符，请用双引号引起来，例如 SQLBOT_DB_PASSWORD="Test@4&^%*^"
-SQLBOT_DB_PASSWORD=Password123@pg
-
 # 其他配置
 ## 普通用户默认密码
 SQLBOT_DEFAULT_PWD=SQLBot@123456
diff --git a/installer/sqlbot/templates/sqlbot.conf b/installer/sqlbot/templates/sqlbot.conf
index c4012e67..6f8ceb1b 100644
--- a/installer/sqlbot/templates/sqlbot.conf
+++ b/installer/sqlbot/templates/sqlbot.conf
@@ -10,11 +10,4 @@ SQL_DEBUG=False
 
 CACHE_TYPE=${SQLBOT_CACHE_TYPE}
 
-# Postgres
-POSTGRES_SERVER=${SQLBOT_DB_HOST}
-POSTGRES_PORT=${SQLBOT_DB_PORT}
-POSTGRES_DB=${SQLBOT_DB_DB}
-POSTGRES_USER=${SQLBOT_DB_USER}
-POSTGRES_PASSWORD=${SQLBOT_DB_PASSWORD} # Change this to your pwd
-
 SERVER_IMAGE_HOST=${SQLBOT_SERVER_IMAGE_HOST}
\ No newline at end of file