From 890ca62d42d684b2fff9e2c2c1c2fe03be342799 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 4 Oct 2020 15:25:10 -0400 Subject: [PATCH 1/8] [FIX] update less to version 3.12.2 instead of 1.6.3 - Fix user documentation generation scss problem - Migration: remove lessc with sudo apt purge node-less --- docker/Dockerfile.base | 6 ++++-- script/install_OSX_dependency.sh | 2 +- script/install_debian_dependency.sh | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index ac44c48..0b043b6 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -24,7 +24,6 @@ RUN apt-get update \ fonts-noto-cjk \ gnupg \ libssl-dev \ - node-less \ npm \ python3-num2words \ python3-pip \ @@ -47,7 +46,6 @@ RUN apt-get update \ libzip-dev \ libldap2-dev \ libsasl2-dev \ - node-less \ gdebi-core \ libffi-dev \ iproute2 \ @@ -86,6 +84,10 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/ && apt-get install --no-install-recommends -y postgresql-client-12 libpq-dev \ && rm -rf /var/lib/apt/lists/* +# Install npm dependencies +RUN npm install -g rtlcss less \ + && ln -fs /usr/local/bin/lessc /usr/bin/lessc + # Install python with pyenv # Reference https://github.com/bopen/docker-ubuntu-pyenv COPY pyenv-version.txt python-versions.txt / diff --git a/script/install_OSX_dependency.sh b/script/install_OSX_dependency.sh index 35bdbac..9806cc1 100755 --- a/script/install_OSX_dependency.sh +++ b/script/install_OSX_dependency.sh @@ -34,7 +34,7 @@ eval "$(docker-machine env default)" echo "\n---- Installing nodeJS NPM and rtlcss for LTR support ----" brew install nodejs npm openssl sudo npm install -g rtlcss -sudo npm install -g lessc +sudo npm install -g less yes n|pyenv install 3.7.7 pyenv local 3.7.7 diff --git a/script/install_debian_dependency.sh b/script/install_debian_dependency.sh index 20f0e60..90e628f 100755 --- a/script/install_debian_dependency.sh +++ b/script/install_debian_dependency.sh @@ -40,13 +40,15 @@ sudo su - postgres -c "createuser -s ${EL_USER}" 2> /dev/null || true # Install Dependencies #-------------------------------------------------- echo -e "\n--- Installing debian dependency --" -sudo apt-get install git build-essential wget libxslt-dev libzip-dev libldap2-dev libsasl2-dev node-less libpng12-0 gdebi-core libffi-dev libbz2-dev -y +sudo apt-get install git build-essential wget libxslt-dev libzip-dev libldap2-dev libsasl2-dev libpng12-0 gdebi-core libffi-dev libbz2-dev -y sudo apt-get install libmariadbd-dev -y echo -e "\n---- Installing nodeJS NPM and rtlcss for LTR support ----" sudo apt-get install nodejs npm -y sudo npm install -g rtlcss -sudo npm install -g lessc +sudo npm install -g less + +sudo ln -fs /usr/local/bin/lessc /usr/bin/lessc if [ ${EL_INSTALL_NGINX} = "True" ]; then echo -e "\n---- Installing nginx ----" From face27816805d2c73102c8c2a7d34f02ef20c805 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Thu, 1 Oct 2020 04:11:12 -0400 Subject: [PATCH 2/8] [FIX] start docker-compose with restart to sync db with odoo --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 44203f5..8c2c18f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: # See the volume section at the end of the file - erplibre_data_dir:/home/odoo/.local/share/Odoo/ - erplibre_conf:/etc/odoo + restart: always db: image: postgres:12.3 @@ -28,6 +29,7 @@ services: PGDATA: /var/lib/postgresql/data/pgdata volumes: - erplibre-db-data:/var/lib/postgresql/data/pgdata + restart: always # We configure volume without specific destination to let docket manage it. To configure it through docker use (read related documentation before continuing) : # - docker volume --help From 47714027ab634af842f89101a8e1b2876592394b Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 2 Oct 2020 00:34:40 -0400 Subject: [PATCH 3/8] [ADD] fork project with fast option - Ignore the repo if already created --- script/fork_project_ERPLibre.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/script/fork_project_ERPLibre.py b/script/fork_project_ERPLibre.py index 6b41317..dbd198e 100644 --- a/script/fork_project_ERPLibre.py +++ b/script/fork_project_ERPLibre.py @@ -39,6 +39,8 @@ def get_config(): help="Ignore fork to generate only manifest.") parser.add_argument('-f', "--force", action="store_true", help="Force rewrite remote.") + parser.add_argument("--fast", action="store_true", + help="Ignore if repo already exist.") parser.add_argument('--github_token', dest="github_token", default=config.get(CST_EL_GITHUB_TOKEN), help="GitHub token generated by user") @@ -69,6 +71,8 @@ def main(): for repo in lst_repo: i += 1 print(f"Nb element {i}/{total} - {repo.get('project_name')}") + if config.fast and repo.get("is_submodule") and os.path.isdir(repo.get("path")): + continue url = repo.get("url") try: From 52c3c4679199eae99215bfd496742d45ed82acfb Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 2 Oct 2020 03:06:32 -0400 Subject: [PATCH 4/8] [ADD] odoo-module-migrator --- manifest/default.dev.xml | 1 + script/install_locally.sh | 1 + source_repo_addons.csv | 1 + 3 files changed, 3 insertions(+) diff --git a/manifest/default.dev.xml b/manifest/default.dev.xml index 238c755..1e9c248 100644 --- a/manifest/default.dev.xml +++ b/manifest/default.dev.xml @@ -94,6 +94,7 @@ + diff --git a/script/install_locally.sh b/script/install_locally.sh index 9d16bc6..8af386d 100755 --- a/script/install_locally.sh +++ b/script/install_locally.sh @@ -153,6 +153,7 @@ 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}/script/OCA_odoo-module-migrator," >> ${EL_CONFIG_FILE} fi printf "\n" >> ${EL_CONFIG_FILE} diff --git a/source_repo_addons.csv b/source_repo_addons.csv index 0e61d6a..9af2f29 100644 --- a/source_repo_addons.csv +++ b/source_repo_addons.csv @@ -124,3 +124,4 @@ https://github.com/itpp-labs/odoo-development.git,doc,master, https://github.com/itpp-labs/odoo-port-docs.git,doc,master, https://github.com/itpp-labs/odoo-test-docs.git,doc,master, https://github.com/odoo/documentation-user.git,doc,, +https://github.com/OCA/odoo-module-migrator.git,script,master, From f435e1c11d44c2ea1b249802245be373e7255fe4 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sat, 3 Oct 2020 01:36:29 -0400 Subject: [PATCH 5/8] [ADD] doc release docker push --- doc/RELEASE.md | 3 +++ docker/README.md | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/RELEASE.md b/doc/RELEASE.md index 1b77090..40e5017 100644 --- a/doc/RELEASE.md +++ b/doc/RELEASE.md @@ -30,6 +30,9 @@ git push --tags ./.venv/repo forall -pc "git diff ERPLibre/v#.#.#..HEAD" ``` +## Push docker +[Build and push guide](../docker/README.md) at section `# Update docker`. + # TIPS ## Compare repo differences with another ERPLibre project To generate a list of differences between repo git commit diff --git a/docker/README.md b/docker/README.md index 95af316..46d23aa 100644 --- a/docker/README.md +++ b/docker/README.md @@ -110,5 +110,8 @@ And restart docker service. You can delete or move all older locations of docker When building your docker with script > ./script/docker_build.sh +List your docker version +> docker image + You need to push your docker image and update your tag, like 1.0.1: -> docker push technolibre/erplibre:1.0.1 +> docker push technolibre/erplibre:VERSION From a607702e63a7a9981e31b171c7a327d58287fc52 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Mon, 5 Oct 2020 01:07:37 -0400 Subject: [PATCH 6/8] [FIX] doc tiny fix --- doc/DEVELOPMENT.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/DEVELOPMENT.md b/doc/DEVELOPMENT.md index c25e3ba..5c6f8f3 100644 --- a/doc/DEVELOPMENT.md +++ b/doc/DEVELOPMENT.md @@ -54,11 +54,6 @@ Run: ./run.sh --stop-after-init -i user_test,disable_mail_server --dev all -d DATABASE ``` -# TODO -```bash -./script/git_change_remote.py -``` - ## Change git url https to git This will update all urls in git format: ```bash @@ -102,7 +97,7 @@ To regenerate only manifest.xml. ./script/fork_project_ERPLibre.py --skip_fork ``` -Check if manifest contains "auto_install" and change the value to False. +Check if manifest contains "auto_install" and change the value to False. ```bash ./script/repo_remove_auto_install.py ``` From 7c3a05c6e67554316e10bb9f70aa84ba3b957d93 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 11 Oct 2020 10:39:47 -0400 Subject: [PATCH 7/8] [UPD] docker: add doc system prune --- docker/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/README.md b/docker/README.md index 46d23aa..f5bc314 100644 --- a/docker/README.md +++ b/docker/README.md @@ -77,9 +77,15 @@ docker stats erplibre_ERPLibre_1 ### Cleaning +Delete all system +```bash +docker system prune -a +``` + Delete docker image ```bash docker image prune +docker rmi $(docker images -q) ``` Delete volumes From 340fd4268c3256a3cf81e2381b9371705bae80f7 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 20 Nov 2020 22:06:49 -0500 Subject: [PATCH 8/8] [FIX] typo --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8c2c18f..7f2b35d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,7 +31,7 @@ services: - erplibre-db-data:/var/lib/postgresql/data/pgdata restart: always -# We configure volume without specific destination to let docket manage it. To configure it through docker use (read related documentation before continuing) : +# We configure volume without specific destination to let docker manage it. To configure it through docker use (read related documentation before continuing) : # - docker volume --help # - docker-compose down --help volumes: