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

update

Browse Source
This commit is contained in:
hoangvv 2025-01-07 23:38:11 +07:00
parent 3bd92c90d2
commit 02a54b0050
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/docker-compose.yml
View File

@ -27,6 +27,7 @@ services:
environment: environment:
- POSTGRES_USER=${PG_USER:-changeme} - POSTGRES_USER=${PG_USER:-changeme}
- POSTGRES_PASSWORD=${PG_PASS:-password} - POSTGRES_PASSWORD=${PG_PASS:-password}
- POSTGRES_DB=postgres
ports: ports:
- ${PG_PORT:-5432}:5432 - ${PG_PORT:-5432}:5432
restart: always restart: always

3
setup/gen-config.py
View File

@ -38,7 +38,6 @@ def main():
parser.add_argument('--db_port', type=int, help='') parser.add_argument('--db_port', type=int, help='')
parser.add_argument('--db_user', type=str, help='') parser.add_argument('--db_user', type=str, help='')
parser.add_argument('--deploy_path', 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('--image', type=str, help='')
parser.add_argument('--tag', type=str, help='') parser.add_argument('--tag', type=str, help='')
parser.add_argument('--addons', type=str, help='') parser.add_argument('--addons', type=str, help='')
@ -50,7 +49,6 @@ def main():
db_pass = "smartyourlife" db_pass = "smartyourlife"
db_user = args.db_user db_user = args.db_user
base_dir= args.deploy_path base_dir= args.deploy_path
db_name=args.db
image=args.image image=args.image
tag=args.tag tag=args.tag
container=args.container container=args.container
@ -81,7 +79,6 @@ def main():
env_file_path = Path("deployment/.env") 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="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_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_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="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") set_key(dotenv_path=env_file_path, key_to_set="ODOO_CONFIG", value_to_set=config_path,quote_mode="never")

2
setup/init_config.sh
View File

@ -92,7 +92,7 @@ Generate_Config(){
cp "${DEPLOY_PATH}/env.template" "${DEPLOY_PATH}/.env" cp "${DEPLOY_PATH}/env.template" "${DEPLOY_PATH}/.env"
fi fi
python "$SETUP_PATH/gen-config.py" --db_port 5432 --db_user $PG_USER --deploy_path "$DEPLOY_PATH" \ 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 --addons "${ODOO_ADDONS}" --config "${ODOO_CONFIG}" --backup community
Show 0 " Generate Config Complete" Show 0 " Generate Config Complete"
} }