From 02a54b0050b622c84c43264960578b892b6e1003 Mon Sep 17 00:00:00 2001
From: hoangvv <shintheman12@gmail.com>
Date: Tue, 7 Jan 2025 23:38:11 +0700
Subject: [PATCH] update

---
 deployment/docker-compose.yml | 1 +
 setup/gen-config.py           | 3 ---
 setup/init_config.sh          | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index e1955bc3d..6f4734282 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -27,6 +27,7 @@ services:
     environment:
       - POSTGRES_USER=${PG_USER:-changeme}
       - POSTGRES_PASSWORD=${PG_PASS:-password}
+      - POSTGRES_DB=postgres
     ports:
       - ${PG_PORT:-5432}:5432
     restart: always             
diff --git a/setup/gen-config.py b/setup/gen-config.py
index 810f63602..d6e9f3c67 100755
--- a/setup/gen-config.py
+++ b/setup/gen-config.py
@@ -38,7 +38,6 @@ def main():
     parser.add_argument('--db_port', type=int, help='')
     parser.add_argument('--db_user', type=str, help='')
     parser.add_argument('--deploy_path', type=str, help='')
-    parser.add_argument('--db', type=str, help='')
     parser.add_argument('--image', type=str, help='')
     parser.add_argument('--tag', type=str, help='')
     parser.add_argument('--addons', type=str, help='')
@@ -50,7 +49,6 @@ def main():
     db_pass = "smartyourlife"
     db_user = args.db_user
     base_dir= args.deploy_path
-    db_name=args.db
     image=args.image
     tag=args.tag
     container=args.container
@@ -81,7 +79,6 @@ def main():
     env_file_path = Path("deployment/.env")
     set_key(dotenv_path=env_file_path, key_to_set="COMPOSE_PROJECT_NAME", value_to_set=f"odoo-{tag}",quote_mode="never")
     set_key(dotenv_path=env_file_path, key_to_set="PG_PORT", value_to_set=find_available_port(5432),quote_mode="never")
-    set_key(dotenv_path=env_file_path, key_to_set="PG_DB", value_to_set=db_name,quote_mode="never")
     set_key(dotenv_path=env_file_path, key_to_set="PG_USER", value_to_set=db_user,quote_mode="never")
     set_key(dotenv_path=env_file_path, key_to_set="PG_PASS", value_to_set=db_pass,quote_mode="never")
     set_key(dotenv_path=env_file_path, key_to_set="ODOO_CONFIG", value_to_set=config_path,quote_mode="never")
diff --git a/setup/init_config.sh b/setup/init_config.sh
index d2d029d33..6e31e5898 100755
--- a/setup/init_config.sh
+++ b/setup/init_config.sh
@@ -92,7 +92,7 @@ Generate_Config(){
         cp "${DEPLOY_PATH}/env.template" "${DEPLOY_PATH}/.env"
     fi
     python "$SETUP_PATH/gen-config.py" --db_port 5432 --db_user $PG_USER --deploy_path "$DEPLOY_PATH" \
-    --db ${PG_DB:=odoo} --image "${ODOO_IMAGE}" --container "${ODOO_CONTAINER}" --tag "${ODOO_TAG:=latest}" \
+    --image "${ODOO_IMAGE}" --container "${ODOO_CONTAINER}" --tag "${ODOO_TAG:=latest}" \
     --addons "${ODOO_ADDONS}" --config "${ODOO_CONFIG}" --backup community
     Show 0 " Generate Config Complete"
 }