From cb5e1f5c26e9731f7527771c9081324d7cde4c49 Mon Sep 17 00:00:00 2001
From: He Wang <wanghechn@qq.com>
Date: Tue, 18 Nov 2025 14:45:19 +0800
Subject: [PATCH] remove redundant env vars in docker compose yaml

---
 docker/.env                    | 18 +++++++++---------
 docker/docker-compose-base.yml | 11 +----------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/docker/.env b/docker/.env
index 96107b352..6a5349dcf 100644
--- a/docker/.env
+++ b/docker/.env
@@ -72,17 +72,17 @@ OCEANBASE_USER=root@ragflow
 # The password for OceanBase
 OCEANBASE_PASSWORD=infini_rag_flow
 # The doc database of the OceanBase service to use
-OCEANBASE_DOC_DBNAME=test
+OCEANBASE_DOC_DBNAME=ragflow_doc
 
 # OceanBase container configuration
-# OB_CLUSTER_NAME=${OB_CLUSTER_NAME:-ragflow}
-# OB_TENANT_NAME=${OB_TENANT_NAME:-ragflow}
-# OB_SYS_PASSWORD=${OCEANBASE_PASSWORD:-infini_rag_flow}
-# OB_TENANT_PASSWORD=${OCEANBASE_PASSWORD:-infini_rag_flow}
-# OB_MEMORY_LIMIT=${OB_MEMORY_LIMIT:-10G}
-# OB_SYSTEM_MEMORY=${OB_SYSTEM_MEMORY:-2G}
-# OB_DATAFILE_SIZE=${OB_DATAFILE_SIZE:-20G}
-# OB_LOG_DISK_SIZE=${OB_LOG_DISK_SIZE:-20G}
+OB_CLUSTER_NAME=${OB_CLUSTER_NAME:-ragflow}
+OB_TENANT_NAME=${OB_TENANT_NAME:-ragflow}
+OB_SYS_PASSWORD=${OCEANBASE_PASSWORD:-infini_rag_flow}
+OB_TENANT_PASSWORD=${OCEANBASE_PASSWORD:-infini_rag_flow}
+OB_MEMORY_LIMIT=${OB_MEMORY_LIMIT:-10G}
+OB_SYSTEM_MEMORY=${OB_SYSTEM_MEMORY:-2G}
+OB_DATAFILE_SIZE=${OB_DATAFILE_SIZE:-20G}
+OB_LOG_DISK_SIZE=${OB_LOG_DISK_SIZE:-20G}
 
 # The password for MySQL.
 MYSQL_PASSWORD=infini_rag_flow
diff --git a/docker/docker-compose-base.yml b/docker/docker-compose-base.yml
index ddca6f06d..05e99e4b2 100644
--- a/docker/docker-compose-base.yml
+++ b/docker/docker-compose-base.yml
@@ -97,7 +97,6 @@ services:
     restart: on-failure
 
   oceanbase:
-    container_name: ragflow-oceanbase
     profiles:
       - oceanbase
     image: oceanbase/oceanbase-ce:4.4.1.0-100000032025101610
@@ -110,18 +109,10 @@ services:
     env_file: .env
     environment:
       - MODE=normal
-      - OB_CLUSTER_NAME=${OB_CLUSTER_NAME:-ragflow}
-      - OB_TENANT_NAME=${OB_TENANT_NAME:-ragflow}
-      - OB_SYS_PASSWORD=${OB_SYS_PASSWORD:-infini_rag_flow}
-      - OB_TENANT_PASSWORD=${OB_TENANT_PASSWORD:-infini_rag_flow}
-      - OB_MEMORY_LIMIT=${OB_MEMORY_LIMIT:-10G}
-      - OB_SYSTEM_MEMORY=${OB_SYSTEM_MEMORY:-2G}
-      - OB_DATAFILE_SIZE=${OB_DATAFILE_SIZE:-20G}
-      - OB_LOG_DISK_SIZE=${OB_LOG_DISK_SIZE:-20G}
       - OB_SERVER_IP=127.0.0.1
     mem_limit: ${MEM_LIMIT}
     healthcheck:
-      test: [ 'CMD-SHELL', 'obclient -h127.0.0.1 -P2881 -uroot@${OB_TENANT_NAME:-ragflow} -p${OB_TENANT_PASSWORD:-infini_rag_flow} -e "SHOW DATABASES;"' ]
+      test: [ 'CMD-SHELL', 'obclient -h127.0.0.1 -P2881 -uroot@${OB_TENANT_NAME:-ragflow} -p${OB_TENANT_PASSWORD:-infini_rag_flow} -e "CREATE DATABASE IF NOT EXISTS ${OCEANBASE_DOC_DBNAME:-ragflow_doc};"' ]
       interval: 10s
       retries: 30
       start_period: 30s