diff --git a/10.0.Dockerfile b/10.0.Dockerfile index c99bd550b70ce9e0b83ca45803bc90f600c4d935..b03b487b86cfb1b97fd0d7c0f799faed3aa70806 100644 --- a/10.0.Dockerfile +++ b/10.0.Dockerfile @@ -79,9 +79,15 @@ RUN set -x; \ /tmp/oca-repos/server-tools/password_security \ /opt/odoo/additional_addons/ &&\ git clone -b 10.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\ - mv /tmp/oca-repos/social/mail_restrict_follower_selection /opt/odoo/additional_addons/ &&\ + mv /tmp/oca-repos/social/mail_debrand \ + /tmp/oca-repos/social/mail_restrict_follower_selection \ + /opt/odoo/additional_addons/ &&\ git clone -b 10.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\ - mv /tmp/oca-repos/web/web_export_view /opt/odoo/additional_addons/ &&\ + 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/ &&\ find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\ chown -R odoo:odoo /opt/odoo diff --git a/12.0.Dockerfile b/12.0.Dockerfile index 906b25bb879d359fe39d957a0cdf5e409a8add5e..f3f36c61c637dc56f428894b619f60c6a9aa22cf 100644 --- a/12.0.Dockerfile +++ b/12.0.Dockerfile @@ -62,6 +62,12 @@ RUN set -x; \ 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/partner-contact.git /tmp/oca-repos/partner-contact &&\ mv /tmp/oca-repos/partner-contact/partner_firstname /opt/odoo/additional_addons/ &&\ + git clone -b 12.0 --depth 1 https://github.com/OCA/server_brand.git /tmp/oca-repos/server_brand &&\ + mv /tmp/oca-repos/server_brand/disable_odoo_online /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/ &&\ + 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 /tmp/oca-repos/web/web_timeline /opt/odoo/additional_addons/ &&\ rm -rf /tmp/oca-repos/ &&\ find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\ chown -R odoo:odoo /opt/odoo diff --git a/README.md b/README.md index 7651a28eb7aa801bc6adf88d63a643cf5dd603a4..e4dc82c1c13e0a6a35b16707d9c9c5aacf0138cd 100644 --- a/README.md +++ b/README.md @@ -40,12 +40,19 @@ The following OCA addons are included (in v10.0, and only the ones followed by * - auth_session_timeout - auth_brute_force - password_security + - repo: server-brand (only in v12) + modules: + - disable_odoo_online - repo: social modules: + - mail_debrand * - mail_restrict_follower_selection - repo: web modules: + - web_environment_ribbon * - web_export_view + - web_responsive * + - web_timeline * ``` # Usage