From 34535a2b7af92453859756996e58830d0e81f931 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Tue, 25 Jan 2022 22:29:13 -0500 Subject: [PATCH 1/6] [ADD] doc production: updating module list and configuration in docker --- doc/PRODUCTION.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/PRODUCTION.md b/doc/PRODUCTION.md index a50dafe..4497f9f 100644 --- a/doc/PRODUCTION.md +++ b/doc/PRODUCTION.md @@ -155,3 +155,33 @@ Check log with ```bash sudo journalctl -feu cron ``` + +# Docker +## Update + +When update a docker, you need to update the list of module. + +Run script to update configuration : +```bash +./script/docker/docker_gen_config.sh +``` + +Edit the docker-compose.yml and update the command line (change DATABASE) to : +```yaml + command: odoo --workers 2 -u erplibre_info -d DATABASE +``` + +Note, the goal is to call `env['ir.module.module'].update_list()`. + +Restart the docker : +```bash +docker-compose down +docker-compose up -d +``` + +Revert the command in docker-compose.yml. + +You can validate in log the update, you need to find `odoo.modules.loading: updating modules list`, check +```bash +docker-compose logs -f +``` From cf19262827e94b5a607e8e9503a133e753f08db2 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 26 Jan 2022 16:39:42 -0500 Subject: [PATCH 2/6] [ADD] script: db drop only test --- Makefile | 4 ++++ script/database/db_drop_all.py | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile b/Makefile index 752ce25..40b88d0 100644 --- a/Makefile +++ b/Makefile @@ -117,6 +117,10 @@ db_drop_db_template: db_drop_all: ./script/database/db_drop_all.py +.PHONY: db_drop_test +db_drop_test: + ./script/database/db_drop_all.py --test_only + .PHONY: db_clean_cache db_clean_cache: ./script/db_restore.py --clean_cache diff --git a/script/database/db_drop_all.py b/script/database/db_drop_all.py index ad6b9be..b9987d0 100755 --- a/script/database/db_drop_all.py +++ b/script/database/db_drop_all.py @@ -22,6 +22,11 @@ def get_config(): epilog="""\ """, ) + parser.add_argument( + "--test_only", + help="test and test_* and other by system test.", + action="store_true", + ) args = parser.parse_args() return args @@ -32,6 +37,12 @@ def main(): out_db = execute_shell("./.venv/bin/python3 ./odoo/odoo-bin db --list") lst_db = out_db.split("\n") for db_name in lst_db: + if config.test_only and not ( + db_name in ("test",) + or db_name.startswith("test_") + or db_name.startswith("new_project_") + ): + continue execute_shell( "./.venv/bin/python3 ./odoo/odoo-bin db --drop --database" f" {db_name}" From a635a942d752b0afb0f4bde68e354aa1c4567408 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 27 Jan 2022 15:48:46 -0500 Subject: [PATCH 3/6] [ADD] makefile: module auto_backup in erplibre_base image --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40b88d0..d474058 100644 --- a/Makefile +++ b/Makefile @@ -177,7 +177,7 @@ db_create_db_test: .PHONY: image_db_create_erplibre_base image_db_create_erplibre_base: ./script/make.sh db_create_db_test - ./script/addons/install_addons.sh test web_responsive,disable_odoo_online,remove_odoo_enterprise,auth_user_case_insensitive,muk_web_theme,muk_utils,muk_branding,muk_mail_branding,muk_web_branding,muk_web_theme_mail,muk_web_utils,fetchmail_notify_error_to_sender,mail_debrand,partner_quebec_tz,erplibre_info,web_timeline,web_diagram_position + ./script/addons/install_addons.sh test web_responsive,disable_odoo_online,remove_odoo_enterprise,auth_user_case_insensitive,muk_web_theme,muk_utils,muk_branding,muk_mail_branding,muk_web_branding,muk_web_theme_mail,muk_web_utils,fetchmail_notify_error_to_sender,mail_debrand,partner_quebec_tz,erplibre_info,web_timeline,web_diagram_position,auto_backup ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_base .PHONY: image_db_create_erplibre_website From 6d4f611979daf80bd2b09e50dea0108adbacf9a8 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 29 Jan 2022 14:44:41 -0500 Subject: [PATCH 4/6] [ADD] makefile image_db_create: website anchor and muk website/pos branding --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d474058..591e876 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,7 @@ image_db_create_erplibre_base: image_db_create_erplibre_website: # Depend on image_db_create_erplibre_base ./script/make.sh image_db_create_erplibre_base - ./script/addons/install_addons.sh test website,erplibre_website_snippets_basic_html,erplibre_website_snippets_cards,erplibre_website_snippets_structures,erplibre_website_snippets_timelines,website_form_builder + ./script/addons/install_addons.sh test website,erplibre_website_snippets_basic_html,erplibre_website_snippets_cards,erplibre_website_snippets_structures,erplibre_website_snippets_timelines,website_form_builder,muk_website_branding,website_snippet_anchor,website_anchor_smooth_scroll ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_website ./script/addons/install_addons.sh test crm,website_crm ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_website_crm @@ -196,7 +196,7 @@ image_db_create_erplibre_website: ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_advance ./script/addons/install_addons.sh test project ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_project - ./script/addons/install_addons.sh test pos_sale + ./script/addons/install_addons.sh test pos_sale,muk_pos_branding ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_pos ./script/addons/install_addons.sh test hr ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database test --restore_image erplibre_ecommerce_pos_hr From fcc651377f96678b4e0d5f0f8ef5c0f92d03ec1b Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 3 Feb 2022 23:11:59 -0500 Subject: [PATCH 5/6] [UPD] makefile: replace make db_restore* by db_restore.py script - this will be more easy to understand the script and change the db name --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 591e876..0b18e79 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ db_restore_erplibre_base_db_test: .PHONY: db_restore_erplibre_base_db_test_module_test db_restore_erplibre_base_db_test_module_test: - ./script/make.sh db_restore_erplibre_base_db_test + ./script/db_restore.py --database test ./script/addons/install_addons.sh test test .PHONY: db_restore_erplibre_base_db_test_image_test @@ -228,17 +228,17 @@ image_diff_base_website: ######################### .PHONY: addons_install_code_generator_basic addons_install_code_generator_basic: - ./script/make.sh db_restore_erplibre_base_db_code_generator + ./script/db_restore.py --database code_generator ./script/addons/install_addons_dev.sh code_generator code_generator .PHONY: addons_install_code_generator_featured addons_install_code_generator_featured: - ./script/make.sh db_restore_erplibre_base_db_code_generator + ./script/db_restore.py --database code_generator ./script/addons/install_addons_dev.sh code_generator code_generator_cron,code_generator_hook,code_generator_portal .PHONY: addons_install_code_generator_full addons_install_code_generator_full: - ./script/make.sh db_restore_erplibre_base_db_code_generator + ./script/db_restore.py --database code_generator ./script/addons/install_addons_dev.sh code_generator code_generator_cron,code_generator_hook,code_generator_portal,code_generator_db_servers,code_generator_website_snippet,code_generator_geoengine,code_generator_theme_website,code_generator_website_leaflet .PHONY: addons_install_code_generator_demo @@ -256,7 +256,7 @@ addons_reinstall_code_generator_demo: .PHONY: addons_install_all_code_generator_demo addons_install_all_code_generator_demo: - ./script/make.sh db_restore_erplibre_base_db_code_generator + ./script/db_restore.py --database code_generator ./script/addons/install_addons_dev.sh code_generator code_generator_demo,code_generator_demo_export_helpdesk,code_generator_demo_internal,code_generator_demo_internal_inherit,code_generator_demo_portal,code_generator_demo_theme_website,code_generator_demo_website_leaflet,code_generator_demo_website_snippet,code_generator_auto_backup # ./script/addons/install_addons_dev.sh code_generator code_generator_demo # ./script/addons/install_addons_dev.sh code_generator code_generator_demo_export_helpdesk @@ -270,7 +270,7 @@ addons_install_all_code_generator_demo: .PHONY: addons_install_all_code_generator_template addons_install_all_code_generator_template: - ./script/make.sh db_restore_erplibre_base_db_template + ./script/db_restore.py --database template ./script/addons/install_addons_dev.sh template demo_portal,auto_backup,demo_internal_inherit ./script/addons/install_addons_dev.sh template code_generator_template_demo_portal,code_generator_template_demo_sysadmin_cron,code_generator_template_demo_internal_inherit #./script/addons/install_addons_dev.sh template demo_portal @@ -282,7 +282,7 @@ addons_install_all_code_generator_template: .PHONY: addons_install_all_generated_demo addons_install_all_generated_demo: - ./script/make.sh db_restore_erplibre_base_db_template + ./script/db_restore.py --database template ./script/addons/install_addons_dev.sh template demo_helpdesk_data,demo_internal,demo_internal_inherit,demo_portal,demo_website_leaflet,demo_website_snippet,auto_backup # TODO support installation theme with cli #./script/addons/install_addons_dev.sh template theme_website_demo_code_generator From a366be94bd731015c72a9022a2b746d60c2989cb Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 3 Feb 2022 23:20:15 -0500 Subject: [PATCH 6/6] [UPD] makefile: improve debug code generator with comment --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0b18e79..d28b5c8 100644 --- a/Makefile +++ b/Makefile @@ -263,10 +263,10 @@ addons_install_all_code_generator_demo: # ./script/addons/install_addons_dev.sh code_generator code_generator_demo_internal # ./script/addons/install_addons_dev.sh code_generator code_generator_demo_internal_inherit # ./script/addons/install_addons_dev.sh code_generator code_generator_demo_portal -# ./script/addons/install_addons_dev.sh code_generator code_generator_auto_backup # ./script/addons/install_addons_dev.sh code_generator code_generator_demo_theme_website # ./script/addons/install_addons_dev.sh code_generator code_generator_demo_website_leaflet # ./script/addons/install_addons_dev.sh code_generator code_generator_demo_website_snippet +# ./script/addons/install_addons_dev.sh code_generator code_generator_auto_backup .PHONY: addons_install_all_code_generator_template addons_install_all_code_generator_template: @@ -284,6 +284,13 @@ addons_install_all_code_generator_template: addons_install_all_generated_demo: ./script/db_restore.py --database template ./script/addons/install_addons_dev.sh template demo_helpdesk_data,demo_internal,demo_internal_inherit,demo_portal,demo_website_leaflet,demo_website_snippet,auto_backup + #./script/addons/install_addons_dev.sh template demo_helpdesk_data + #./script/addons/install_addons_dev.sh template demo_internal + #./script/addons/install_addons_dev.sh template demo_internal_inherit + #./script/addons/install_addons_dev.sh template demo_portal + #./script/addons/install_addons_dev.sh template demo_website_leaflet + #./script/addons/install_addons_dev.sh template demo_website_snippet + #./script/addons/install_addons_dev.sh template auto_backup # TODO support installation theme with cli #./script/addons/install_addons_dev.sh template theme_website_demo_code_generator @@ -391,7 +398,7 @@ test_installation_demo: ./script/db_restore.py --database test_demo ./script/addons/install_addons.sh test_demo demo_helpdesk_data,demo_internal,demo_internal_inherit,demo_mariadb_sql_example_1,demo_portal,demo_website_data,demo_website_leaflet,demo_website_snippet # TODO cannot install from command line (CLI) - #./script/addons/install_addons.sh test_demo theme_website_demo_code_generator ./addons/TechnoLibre_odoo-code-generator-template + #./script/addons/install_addons.sh test_demo theme_website_demo_code_generator .PHONY: test_code_generator_generation test_code_generator_generation: