From 13e3b2ad7844b23095781f1e0649b4d6bc833fa1 Mon Sep 17 00:00:00 2001 From: hoangvv Date: Wed, 15 Jan 2025 14:36:21 +0700 Subject: [PATCH] update @docker --- .gitea/workflows/init_setup_environment.yml | 2 +- setup/gen_config_docker.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/init_setup_environment.yml b/.gitea/workflows/init_setup_environment.yml index e57633f42..b78f286d0 100644 --- a/.gitea/workflows/init_setup_environment.yml +++ b/.gitea/workflows/init_setup_environment.yml @@ -42,7 +42,7 @@ jobs: docker: if: contains(github.event.head_commit.message, '@docker') - runs-on: host + runs-on: ubuntu-latest env: DB_USER: ${{ secrets.DB_USER }} DB_PASSWORD: ${{ secrets.DB_PASSWORD }} diff --git a/setup/gen_config_docker.py b/setup/gen_config_docker.py index 78dc4ba52..8f42625b1 100755 --- a/setup/gen_config_docker.py +++ b/setup/gen_config_docker.py @@ -78,7 +78,7 @@ def main(): # Update .env file 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_PORT", value_to_set=find_available_port(int(os.getenv('DB_PORT','5432'))+1),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")