diff --git a/CHANGELOG.md b/CHANGELOG.md index c086e8c..db87f5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,11 +12,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Because new update of Python and Poetry, recreate virtual environment. ```bash -rm -r ~/.poetry -rm -r ~/.pyenv +rm -rf ~/.poetry +rm -rf ~/.pyenv rm ./get-poetry.py -rm -r ./.venv +rm -rf ./.venv make install ``` diff --git a/Makefile b/Makefile index ba74a55..79528dc 100644 --- a/Makefile +++ b/Makefile @@ -243,7 +243,7 @@ image_db_create_erplibre_website: image_db_create_erplibre_demo: ./.venv/bin/python3 ./odoo/odoo-bin db --drop --database image_creation_demo ./.venv/bin/python3 ./odoo/odoo-bin db --create --database image_creation_demo --demo - ./script/addons/install_addons_from_file.sh image_creation_erplibre_base ./conf/module_list_image_erplibre_base.txt + ./script/addons/install_addons_from_file.sh image_creation_demo ./conf/module_list_image_erplibre_base.txt ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database image_creation_demo --restore_image erplibre_demo_base ./script/addons/install_addons.sh image_creation_demo 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,website_snippet_all,crm,website_crm,crm_team_quebec,website_livechat,website_sale,erplibre_base_quebec,website_snippet_product_category,website_snippet_carousel_product,stock,purchase,website_sale_management,project,pos_sale,muk_pos_branding,hr ./script/addons/install_addons_theme.sh image_creation_demo theme_default @@ -386,6 +386,13 @@ image_db_create_erplibre_package_wiki: ./script/addons/install_addons.sh image_creation_erplibre_package_wiki document_page,document_page_approval,document_page_group,document_page_project,document_page_reference,document_page_tag,document_url,knowledge,attachment_preview,document_page_procedure,document_page_quality_manual,document_page_work_instruction,mgmtsystem,mgmtsystem_action,mgmtsystem_audit,mgmtsystem_hazard,mgmtsystem_manual,mgmtsystem_nonconformity,mgmtsystem_nonconformity_hr,mgmtsystem_nonconformity_product,mgmtsystem_nonconformity_project,mgmtsystem_quality,mgmtsystem_review,mgmtsystem_survey ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database image_creation_erplibre_package_wiki --restore_image erplibre_package_wiki +.PHONY: image_db_create_erplibre_package_dms +image_db_create_erplibre_package_dms: +# ./.venv/bin/python3 ./odoo/odoo-bin db --drop --database image_creation_erplibre_package_dms +# ./.venv/bin/python3 ./odoo/odoo-bin db --clone --from_database image_creation_erplibre_base --database image_creation_erplibre_package_dms + ./script/addons/install_addons.sh image_creation_erplibre_package_dms muk_dms,muk_dms_access,muk_dms_view,muk_web_preview,muk_web_preview_audio,muk_web_preview_csv,muk_web_preview_image,muk_web_preview_markdown,muk_web_preview_msoffice,muk_web_preview_opendocument,muk_web_preview_rst,muk_web_preview_text,muk_web_preview_video + ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database image_creation_erplibre_package_dms --restore_image erplibre_package_dms + .PHONY: image_db_create_all image_db_create_all: #./script/make.sh config_gen_image_db @@ -410,6 +417,7 @@ image_db_create_all: ./script/make.sh image_db_create_erplibre_package_timesheet ./script/make.sh image_db_create_erplibre_package_website ./script/make.sh image_db_create_erplibre_package_wiki + ./script/make.sh image_db_create_erplibre_package_dms ./script/make.sh image_db_create_test_website_attachments #./script/make.sh config_gen_all @@ -920,6 +928,16 @@ docker_build: docker_build_release: ./script/docker/docker_build.sh --release +# build docker release alpha +.PHONY: docker_build_release_alpha +docker_build_release_alpha: + ./script/docker/docker_build.sh --release_alpha + +# build docker release beta +.PHONY: docker_build_release_beta +docker_build_release_beta: + ./script/docker/docker_build.sh --release_beta + # docker clean all .PHONY: docker_clean_all docker_clean_all: diff --git a/conf/image_db_create.txt b/conf/image_db_create.txt index a9c43fc..28b9b85 100644 --- a/conf/image_db_create.txt +++ b/conf/image_db_create.txt @@ -12,6 +12,7 @@ ./script/make.sh image_db_create_erplibre_package_timesheet ./script/make.sh image_db_create_erplibre_package_website ./script/make.sh image_db_create_erplibre_package_wiki +./script/make.sh image_db_create_erplibre_package_dms ./script/make.sh image_db_create_erplibre_package_accounting ./script/make.sh image_db_create_erplibre_package_business_requirements ./script/make.sh image_db_create_erplibre_website diff --git a/doc/RELEASE.md b/doc/RELEASE.md index dbb3625..7407d56 100644 --- a/doc/RELEASE.md +++ b/doc/RELEASE.md @@ -198,3 +198,9 @@ To generate a list of differences between repo git commit ```bash ./script/git/git_change_remote.py --sync_to /path/to/directory ``` + +## Semantic versioning + +``` + ::= "-" "+" +``` diff --git a/script/docker/docker_build.sh b/script/docker/docker_build.sh index 15e0499..c27c6e9 100755 --- a/script/docker/docker_build.sh +++ b/script/docker/docker_build.sh @@ -3,6 +3,8 @@ ARGS="" IS_RELEASE=false +IS_RELEASE_ALPHA=false +IS_RELEASE_BETA=false ERPLIBRE_DOCKER_BASE="technolibre/erplibre-base" ERPLIBRE_DOCKER_PROD="technolibre/erplibre" @@ -14,15 +16,30 @@ do elif [ "$arg" == "--release" ] then IS_RELEASE=true + elif [ "$arg" == "--release_alpha" ] + then + IS_RELEASE_ALPHA=true + elif [ "$arg" == "--release_beta" ] + then + IS_RELEASE_BETA=true fi done -if [ "$IS_RELEASE" == false ] +if [ "$IS_RELEASE_ALPHA" == true ] +then + # Add commit hash when release alpha + ERPLIBRE_VERSION="${ERPLIBRE_VERSION}_ALPHA_$(git rev-parse --short HEAD)" +elif [ "$IS_RELEASE_BETA" == true ] +then + # Add commit hash when release beta + ERPLIBRE_VERSION="${ERPLIBRE_VERSION}_BETA_$(git rev-parse --short HEAD)" +elif [ "$IS_RELEASE" == false ] then # Add commit hash when not a release ERPLIBRE_VERSION="${ERPLIBRE_VERSION}_$(git rev-parse --short HEAD)" fi + ERPLIBRE_DOCKER_BASE_VERSION="${ERPLIBRE_DOCKER_BASE}:${ERPLIBRE_VERSION}" ERPLIBRE_DOCKER_PROD_VERSION="${ERPLIBRE_DOCKER_PROD}:${ERPLIBRE_VERSION}" diff --git a/script/install/install_locally.sh b/script/install/install_locally.sh index 773771d..ac1c7cb 100755 --- a/script/install/install_locally.sh +++ b/script/install/install_locally.sh @@ -117,7 +117,10 @@ ${VENV_PATH}/bin/pip install --upgrade pip if [[ ! -f "${POETRY_PATH}" ]]; then ${VENV_PATH}/bin/pip install poetry==${POETRY_VERSION} ${VENV_PATH}/bin/poetry --version - ${VENV_PATH}/bin/poetry lock --no-update + # Fix broken poetry by installing ignored dependence + ${VENV_PATH}/bin/pip install vatnumber + ${VENV_PATH}/bin/pip install suds-jurko + # ${VENV_PATH}/bin/poetry lock --no-update ${VENV_PATH}/bin/poetry install retVal=$? if [[ $retVal -ne 0 ]]; then @@ -125,9 +128,6 @@ if [[ ! -f "${POETRY_PATH}" ]]; then exit 1 fi fi -# Fix broken poetry by installing ignored dependence -${VENV_PATH}/bin/pip install vatnumber -${VENV_PATH}/bin/pip install suds-jurko # Delete artifacts created by pip, cause error in next "poetry install" rm -rf artifacts