From f4aa9f70def30a5af9517164f3afc9636d8ea355 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 17 Jan 2021 01:43:53 -0500 Subject: [PATCH 1/5] [ADD] docker erplibre addons for external addons --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6870cc3..99a67b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,8 @@ services: command: odoo volumes: # See the volume section at the end of the file - - erplibre_data_dir:/home/odoo/.local/share/Odoo/ + - erplibre_data_dir:/home/odoo/.local/share/Odoo + - ./addons/addons:/ERPLibre/addons/addons - erplibre_conf:/etc/odoo restart: always From e220944ec28c96e677b0547e2091d69f2df9cae5 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 17 Jan 2021 02:47:55 -0500 Subject: [PATCH 2/5] [FIX] docker missing path addons in config --- docker/repo_manifest_gen_org_prefix_path.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/repo_manifest_gen_org_prefix_path.py b/docker/repo_manifest_gen_org_prefix_path.py index 3456268..7838e11 100755 --- a/docker/repo_manifest_gen_org_prefix_path.py +++ b/docker/repo_manifest_gen_org_prefix_path.py @@ -24,6 +24,8 @@ addonsDirs = [abspath(join(addonsBaseDir, f)) for f in listdir(addonsBaseDir) if isdir(join(addonsBaseDir, f))] # addonsDirs.insert(0, "/usr/lib/python3/dist-packages/odoo/addons/") +# TODO path addons/addons is not exist in docker, so force to add it +addonsDirs.insert(0, "/ERPLibre/addons/addons") addonsDirs.insert(0, "/ERPLibre/odoo/addons/") config = configparser.ConfigParser() From 6dc295d557fb973e127a88848cfa6e2aa9ec73dc Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 17 Jan 2021 03:26:10 -0500 Subject: [PATCH 3/5] [ADD] makefile docker build --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile b/Makefile index dc22652..b62246f 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,19 @@ else endif endif +############ +# docker # +############ +# build docker +.PHONY: docker_build +docker_build: + ./script/docker_build.sh + +# build docker release +.PHONY: docker_build_release +docker_build_release: + ./script/docker_build.sh --release + ############## # Git repo # ############## From e3416eb681a6023bbd394c3d3a42948ee894ec69 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 17 Jan 2021 03:35:36 -0500 Subject: [PATCH 4/5] [ADD] docker clean all --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index b62246f..e9a2992 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,11 @@ docker_build: docker_build_release: ./script/docker_build.sh --release +# docker clean all +.PHONY: docker_clean_all +docker_clean_all: + docker system prune -a --volumes + ############## # Git repo # ############## From 081fadcde60c141f5f5cf73766c9c634fe82ed85 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Mon, 18 Jan 2021 05:17:59 -0500 Subject: [PATCH 5/5] [ADD] makefile addons installation - support code_generator Signed-off-by: Mathieu Benoit --- Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Makefile b/Makefile index e9a2992..ae6d794 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,17 @@ else endif endif +######################### +# Addons installation # +######################### +.PHONY: addons_install_code_generator_demo +addons_install_code_generator_demo: + ./run.sh --no-http --stop-after-init -d code_generator -i code_generator_demo -u code_generator_demo + +.PHONY: addons_uninstall_code_generator_demo +addons_uninstall_code_generator_demo: + ./run.sh --no-http --stop-after-init -d code_generator --uninstall code_generator_demo + ############ # docker # ############