From 95bcb0b51ada73180e1dc96d8a75066b00384da9 Mon Sep 17 00:00:00 2001 From: Matt Marcha Date: Mon, 28 Apr 2025 08:36:24 -1000 Subject: [PATCH] fix compose file --- config/odoo.conf | 16 ++++++++-------- docker-compose.yml | 4 +--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/config/odoo.conf b/config/odoo.conf index 4b0272f..74d2cc2 100644 --- a/config/odoo.conf +++ b/config/odoo.conf @@ -1,7 +1,7 @@ [options] addons_path = /mnt/extra-addons,/mnt/openupgrade -upgrade_path = /mnt/openupgrade-scripts/scripts -server_wide_modules = base,web,openupgrade_framework +upgrade_path = /mnt/openupgrade/openupgrade-scripts/scripts +server_wide_modules = web,openupgrade_framework ; data_dir = /var/lib/odoo admin_passwd = odoo ; csv_internal_sep = , @@ -14,11 +14,11 @@ dbfilter = .* debug_mode = True without_demo = all ; email_from = False -limit_memory_hard = 26843545600 -limit_memory_soft = 21474836480 -limit_request = 81920 -limit_time_cpu = 600 -limit_time_real = 1200 +; limit_memory_hard = 26843545600 +; limit_memory_soft = 21474836480 +; limit_request = 81920 +; limit_time_cpu = 600 +; limit_time_real = 1200 ; list_db = True ; log_db = False ; log_handler = [':INFO'] @@ -33,7 +33,7 @@ smtp_port = 1025 smtp_server = mailcatcher ; smtp_ssl = False ; smtp_user = False -workers = 7 +; workers = 7 ; xmlrpc = True ; xmlrpc_interface = ; xmlrpc_port = 8069 diff --git a/docker-compose.yml b/docker-compose.yml index 11638be..941334a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,5 @@ services: web: - image: odoo:15.0 build: . depends_on: - db @@ -10,8 +9,7 @@ services: - odoo-web:/var/lib/odoo - ./config:/etc/odoo - ./modules:/mnt/extra-addons - - /home/matt/Dev/src/openupgrade/15/openupgrade_framework:/mnt/openupgrade - - /home/matt/Dev/src/openupgrade/15/openupgrade_scripts:/mnt/openupgrade-scripts + - /home/matt/Dev/src/openupgrade/15:/mnt/openupgrade command: "odoo ${COMMAND}" db: image: postgres:12.20