diff --git a/12.0.Dockerfile b/12.0.Dockerfile index e00ef968af625bc956a58c41e4e05b01b686c147..e4c95cd0f025d3fd1d432e2e59d2eec9f08dccba 100644 --- a/12.0.Dockerfile +++ b/12.0.Dockerfile @@ -63,13 +63,28 @@ RUN set -x; \ mkdir -p /tmp/oca-repos/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/account-financial-reporting.git /tmp/oca-repos/account-financial-reporting &&\ mv /tmp/oca-repos/account-financial-reporting/account_tax_balance /opt/odoo/additional_addons/ &&\ + git clone -b 12.0 --depth 1 https://github.com/OCA/account-financial-tools.git /tmp/oca-repos/account-financial-tools &&\ + mv /tmp/oca-repos/account-financial-tools/account_lock_date_update \ + /opt/odoo/additional_addons/ &&\ + git clone -b 12.0 --depth 1 https://github.com/OCA/account-invoicing.git /tmp/oca-repos/account-invoicing &&\ + mv /tmp/oca-repos/account-invoicing/sale_timesheet_invoice_description \ + /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/bank-statement-import.git /tmp/oca-repos/bank-statement-import &&\ mv /tmp/oca-repos/bank-statement-import/account_bank_statement_import_ofx /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/knowledge.git /tmp/oca-repos/knowledge &&\ mv /tmp/oca-repos/knowledge/knowledge /tmp/oca-repos/knowledge/document_page /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/partner-contact.git /tmp/oca-repos/partner-contact &&\ - mv /tmp/oca-repos/partner-contact/partner_firstname \ + mv /tmp/oca-repos/partner-contact/partner_contact_sale_info_propagation \ /tmp/oca-repos/partner-contact/partner_disable_gravatar \ + /tmp/oca-repos/partner-contact/partner_firstname \ + /tmp/oca-repos/partner-contact/partner_prospect \ + /opt/odoo/additional_addons/ &&\ + git clone -b 12.0 --depth 1 https://github.com/OCA/project.git /tmp/oca-repos/project &&\ + mv /tmp/oca-repos/project/project_category \ + /tmp/oca-repos/project/project_status \ + /tmp/oca-repos/project/project_task_default_stage \ + /tmp/oca-repos/project/project_template \ + /tmp/oca-repos/project/project_timeline \ /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/server-auth.git /tmp/oca-repos/server-auth &&\ mv /tmp/oca-repos/server-auth/auth_session_timeout \ @@ -80,13 +95,18 @@ RUN set -x; \ /tmp/oca-repos/server-brand/remove_odoo_enterprise \ /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/server-ux.git /tmp/oca-repos/server-ux &&\ - mv /tmp/oca-repos/server-ux/date_range /opt/odoo/additional_addons/ &&\ + mv /tmp/oca-repos/server-ux/base_technical_features \ + /tmp/oca-repos/server-ux/date_range \ + /tmp/oca-repos/server-ux/mass_editing \ + /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\ - mv /tmp/oca-repos/social/mail_debrand /opt/odoo/additional_addons/ &&\ + mv /tmp/oca-repos/social/base_search_mail_content \ + /tmp/oca-repos/social/mail_debrand \ + /opt/odoo/additional_addons/ &&\ git clone -b 12.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\ - mv /tmp/oca-repos/web/web_responsive \ - /tmp/oca-repos/web/web_environment_ribbon \ + mv /tmp/oca-repos/web/web_environment_ribbon \ /tmp/oca-repos/web/web_export_view \ + /tmp/oca-repos/web/web_responsive \ /tmp/oca-repos/web/web_timeline \ /opt/odoo/additional_addons/ &&\ rm -rf /tmp/oca-repos/ &&\ diff --git a/README.md b/README.md index 5f22333b9988430b6ea75de3f7042157f600a230..85f35f63a0d01ff8b161d72df48a7b7880182305 100644 --- a/README.md +++ b/README.md @@ -18,49 +18,60 @@ It creates a functional Odoo Docker of limited size (< 400 MB), including Odoo 1 In order to reduce as much as possible the size of the Docker, only French translations are kept and .git directories are removed. -The following OCA addons are included (in v10.0, and only the ones followed by * for v12.0 since not (yet) available): +The following OCA addons are included (in v12.0): ```yaml - repo: account-financial-reporting modules: - - account_tax_balance * + - account_tax_balance + - repo: account-financial-tools + modules: + - account_lock_date_update + - repo: account-invoicing + modules: + - sale_timesheet_invoice_description - repo: bank-statement-import modules: - - account_bank_statement_import_ofx * - - account_bank_statement_import_qif + - account_bank_statement_import_ofx - repo: knowledge modules: - - document_page * - - knowledge * + - document_page + - knowledge - repo: partner-contact modules: - - partner_firstname * - - partner_disable_gravatar * - - repo: server-auth (only in v12, modules were in server-tools in v10) + - partner_contact_sale_info_propagation + - partner_disable_gravatar + - partner_firstname + - partner_prospect + - repo: project + modules: + - project_category + - project_status + - project_task_default_stage + - project_template + - project_timeline + - repo: server-auth modules: - auth_session_timeout - password_security - - repo: server-tools - modules: - - date_range (moved to server-ux in v12) - - auth_session_timeout (moved to server-auth in v12) - - auth_brute_force - - password_security (moved to server-auth in v12) - - repo: server-brand (only in v12) + - repo: server-brand modules: - disable_odoo_online - - repo: server-ux (only in v12) + - remove_odoo_enterprise + - repo: server-ux modules: - - date_range (was in server-tools in v10) + - base_technical_features + - date_range + - mass_editing - repo: social modules: - - mail_debrand * - - mail_restrict_follower_selection + - base_search_mail_content + - mail_debrand - repo: web modules: - - web_environment_ribbon * - - web_export_view * - - web_responsive * - - web_timeline * + - web_environment_ribbon + - web_export_view + - web_responsive + - web_timeline ``` # Usage