From 5cf8cd46d987e30b144690eb227b6e47745b80f4 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 20 Jan 2021 04:24:06 -0500 Subject: [PATCH 1/5] [ADD] ERPLibre_image_db to load image database --- .gitignore | 3 ++- manifest/default.dev.xml | 1 + script/install_locally.sh | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 53a7dcd..b725e9e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ addons doc/itpp* doc/odoo* script/OCA* -odoo \ No newline at end of file +odoo +image_db diff --git a/manifest/default.dev.xml b/manifest/default.dev.xml index 6aeb033..a9b4c1d 100644 --- a/manifest/default.dev.xml +++ b/manifest/default.dev.xml @@ -23,6 +23,7 @@ + diff --git a/script/install_locally.sh b/script/install_locally.sh index 0951fd1..c3f8855 100755 --- a/script/install_locally.sh +++ b/script/install_locally.sh @@ -128,6 +128,7 @@ if [[ ${EL_MINIMAL_ADDONS} = "False" ]]; then printf "${EL_HOME}/addons/OCA_website-cms," >> ${EL_CONFIG_FILE} printf "${EL_HOME}/addons/OCA_wms," >> ${EL_CONFIG_FILE} printf "${EL_HOME}/addons/Smile-SA_odoo_addons," >> ${EL_CONFIG_FILE} + printf "${EL_HOME}/addons/TechnoLibre_odoo-code-generator," >> ${EL_CONFIG_FILE} printf "${EL_HOME}/addons/camptocamp_odoo-cloud-platform," >> ${EL_CONFIG_FILE} printf "${EL_HOME}/addons/dhongu_deltatech," >> ${EL_CONFIG_FILE} printf "${EL_HOME}/addons/it-projects-llc_odoo-saas-tools," >> ${EL_CONFIG_FILE} @@ -153,8 +154,8 @@ if [[ ${EL_MINIMAL_ADDONS} = "False" ]]; then printf "${EL_HOME}/doc/itpp-labs_odoo-port-docs," >> ${EL_CONFIG_FILE} printf "${EL_HOME}/doc/itpp-labs_odoo-test-docs," >> ${EL_CONFIG_FILE} printf "${EL_HOME}/doc/odoo_documentation-user," >> ${EL_CONFIG_FILE} + printf "${EL_HOME}/image_db," >> ${EL_CONFIG_FILE} printf "${EL_HOME}/script/OCA_odoo-module-migrator," >> ${EL_CONFIG_FILE} - printf "${EL_HOME}/addons/TechnoLibre_odoo-code-generator," >> ${EL_CONFIG_FILE} fi printf "\n" >> ${EL_CONFIG_FILE} From 47d1d61c2db57ad9cd53d9e8efcc245ace593157 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 20 Jan 2021 06:35:10 -0500 Subject: [PATCH 2/5] [ADD] Makefile run command, db installation, dev installation - code generator demo installation --- Makefile | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/Makefile b/Makefile index ae6d794..9ccca0f 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,71 @@ else endif endif +######### +# RUN # +######### +.PHONY: run +run: + echo http://localhost:8069 + echo http://localhost:8069/web/database/manager + ./run.sh + +.PHONY: run_test +run_test: + echo http://localhost:8069 + ./run.sh --database test + +.PHONY: run_code_generator +run_code_generator: + echo http://localhost:8069 + ./run.sh --database code_generator + +############# +# INSTALL # +############# +.PHONY: install_dev +install_dev: + ./script/install_locally_dev.sh + +##################### +# DB installation # +##################### +.PHONY: db_list +db_list: + ./.venv/bin/python3 ./odoo/odoo-bin db --list + +.PHONY: db_list_incompatible_database +db_list_incompatible_database: + ./.venv/bin/python3 ./odoo/odoo-bin db --list_incompatible_db + +.PHONY: db_version +db_version: + ./.venv/bin/python3 ./odoo/odoo-bin db --version + +.PHONY: db_drop_db_test +db_drop_db_test: + ./.venv/bin/python3 ./odoo/odoo-bin db --drop --database test + +.PHONY: db_drop_db_code_generator +db_drop_db_code_generator: + ./.venv/bin/python3 ./odoo/odoo-bin db --drop --database code_generator + +.PHONY: db_restore_erplibre_base_db_test +db_restore_erplibre_base_db_test: + ./.venv/bin/python3 ./odoo/odoo-bin db --restore --restore_image erplibre_base --database test + +.PHONY: db_restore_erplibre_website_db_test +db_restore_erplibre_website_db_test: + ./.venv/bin/python3 ./odoo/odoo-bin db --restore --restore_image erplibre_website --database test + +.PHONY: db_restore_erplibre_website_chat_crm_db_test +db_restore_erplibre_website_chat_crm_db_test: + ./.venv/bin/python3 ./odoo/odoo-bin db --restore --restore_image erplibre_website_chat_crm --database test + +.PHONY: db_restore_erplibre_base_db_code_generator +db_restore_erplibre_base_db_code_generator: + ./.venv/bin/python3 ./odoo/odoo-bin db --restore --restore_image erplibre_base --database code_generator + ######################### # Addons installation # ######################### @@ -40,6 +105,19 @@ addons_install_code_generator_demo: addons_uninstall_code_generator_demo: ./run.sh --no-http --stop-after-init -d code_generator --uninstall code_generator_demo +.PHONY: addons_install_all_code_generator_demo +addons_install_all_code_generator_demo: + ./run.sh --no-http --stop-after-init -d code_generator -i code_generator_demo -u code_generator_demo + ./run.sh --no-http --stop-after-init -d code_generator -i code_generator_demo_export_helpdesk -u code_generator_demo_export_helpdesk + ./run.sh --no-http --stop-after-init -d code_generator -i code_generator_demo_internal -u code_generator_demo_internal + ./run.sh --no-http --stop-after-init -d code_generator -i code_generator_demo_portal -u code_generator_demo_portal + ./run.sh --no-http --stop-after-init -d code_generator -i code_generator_demo_theme_website -u code_generator_demo_theme_website + ./run.sh --no-http --stop-after-init -d code_generator -i code_generator_demo_website_leaflet -u code_generator_demo_website_leaflet + +.PHONY: addons_uninstall_all_code_generator_demo +addons_uninstall_all_code_generator_demo: + ./run.sh --no-http --stop-after-init -d code_generator --uninstall code_generator_demo,code_generator_demo_export_helpdesk,code_generator_demo_internal,code_generator_demo_portal,code_generator_demo_theme_website,code_generator_demo_website_leaflet + ############ # docker # ############ From 82ba6f910df7a5234ddab740afb7aceacb88e2c0 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 20 Jan 2021 06:08:08 -0500 Subject: [PATCH 3/5] [FIX] workers at 0 by default for dev, prod use another system --- script/install_locally.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install_locally.sh b/script/install_locally.sh index c3f8855..1acaa6f 100755 --- a/script/install_locally.sh +++ b/script/install_locally.sh @@ -159,7 +159,7 @@ if [[ ${EL_MINIMAL_ADDONS} = "False" ]]; then fi printf "\n" >> ${EL_CONFIG_FILE} -printf "workers = 2\n" >> ${EL_CONFIG_FILE} +printf "workers = 0\n" >> ${EL_CONFIG_FILE} printf "max_cron_threads = 2\n" >> ${EL_CONFIG_FILE} if [[ ${EL_INSTALL_NGINX} = "True" ]]; then From 1b0a44fd1844f05dfe93291287b50e1b1dfc12d7 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 20 Jan 2021 06:23:44 -0500 Subject: [PATCH 4/5] [ADD] FAQ networking show all port open --- doc/FAQ.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/FAQ.md b/doc/FAQ.md index 57638a4..570269e 100644 --- a/doc/FAQ.md +++ b/doc/FAQ.md @@ -1,4 +1,10 @@ # FAQ +## Networking +Show all open port +```bash +sudo lsof -i -P -n | grep LISTEN +``` + ## git-repo ### error.GitError fatal bad revision Example: From aaaaabb027c910a2677db47e4109fe074774e671 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Wed, 20 Jan 2021 06:31:49 -0500 Subject: [PATCH 5/5] [ADD] makefile docker command --- Makefile | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Makefile b/Makefile index 9ccca0f..e985871 100644 --- a/Makefile +++ b/Makefile @@ -121,6 +121,31 @@ addons_uninstall_all_code_generator_demo: ############ # docker # ############ +# run docker +.PHONY: docker_run +docker_run: + docker-compose up + +.PHONY: docker_run_daemon +docker_run_daemon: + docker-compose up -d + +.PHONY: docker_stop +docker_stop: + docker-compose down + +.PHONY: docker_show_logs_live +docker_show_logs_live: + docker-compose logs -f + +.PHONY: docker_show_process +docker_show_process: + docker-compose ps + +.PHONY: docker_exec_erplibre +docker_exec_erplibre: + docker exec -u root -ti erplibre_ERPLibre_1 bash + # build docker .PHONY: docker_build docker_build: