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 ``` 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-compose.yml b/docker-compose.yml index cc2a6e9..7abc93e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,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 @@ -31,8 +32,9 @@ 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) : +# 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: diff --git a/docker/README.md b/docker/README.md index 95af316..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 @@ -110,5 +116,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 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/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: diff --git a/script/install_locally.sh b/script/install_locally.sh index c3646f4..7d49bc1 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,