NextERP/Odoo18-Base
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update @native
Some checks failed
Setup Docker Action / setup_docker (3.12.7) (push) Has been skipped
Details
Setup Native Action / setup_native (3.12.7) (push) Failing after 1m33s
Details

Browse Source
This commit is contained in:
hoangvv 2025-01-15 11:28:13 +07:00
parent ba5c38f465
commit 4b6bff7c65
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/gen_config.py
View File

@ -35,10 +35,12 @@ def main():
parser.add_argument('--addons_path', type=str, help='') parser.add_argument('--addons_path', type=str, help='')
parser.add_argument('--db_filter', type=str, help='') parser.add_argument('--db_filter', type=str, help='')
parser.add_argument('--db_port', type=int, help='') parser.add_argument('--db_port', type=int, help='')
parser.add_argument('--db_server', type=int, help='')
args = parser.parse_args() args = parser.parse_args()
db_port = args.db_port db_port = args.db_port
db_user = args.db_user db_user = args.db_user
db_pass = args.db_pass db_pass = args.db_pass
db_server = args.db_server
app_port = find_available_port(8069) app_port = find_available_port(8069)
addons_path = args.addons_path addons_path = args.addons_path
base_dir= args.deploy_path base_dir= args.deploy_path
@ -51,7 +53,7 @@ def main():
# Update Odoo configuration file # Update Odoo configuration file
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(f'{base_dir}/odoo.conf') config.read(f'{base_dir}/odoo.conf')
config['options']['db_host'] = "localhost" config['options']['db_host'] = db_server
config['options']['db_user'] = db_user config['options']['db_user'] = db_user
config['options']['db_password'] = db_pass config['options']['db_password'] = db_pass
config['options']['db_port'] = str(db_port) config['options']['db_port'] = str(db_port)

2
setup/init_config.sh
View File

@ -213,7 +213,7 @@ else
psql "postgresql://${DB_USER}:${DB_PASSWORD}@${DB_SERVER}:${DB_PORT}/postgres" -c "ALTER USER $USER WITH PASSWORD '$PASSWORD';" psql "postgresql://${DB_USER}:${DB_PASSWORD}@${DB_SERVER}:${DB_PORT}/postgres" -c "ALTER USER $USER WITH PASSWORD '$PASSWORD';"
fi fi
${PYTHON} "$SETUP_PATH/gen_config.py" --db_user $USER --db_pass $PASSWORD --deploy_path "$(pwd)" \ ${PYTHON} "$SETUP_PATH/gen_config.py" --db_user $USER --db_pass $PASSWORD --deploy_path "$(pwd)" \
--addons_path $ADDONS --db_port $DB_PORT --addons_path $ADDONS --db_port $DB_PORT --db_server $DB_SERVER
Show 0 " Generate Config Complete" Show 0 " Generate Config Complete"
} }
main(){ main(){