From 7a45d6e9a22f35e522efd0c0913032b22d82492f Mon Sep 17 00:00:00 2001
From: remi-filament <30716308+remi-filament@users.noreply.github.com>
Date: Mon, 28 Jan 2019 17:43:59 +0100
Subject: [PATCH] Add OCA default modules

---
 10.0.Dockerfile | 10 ++++++++--
 12.0.Dockerfile |  6 ++++++
 README.md       |  7 +++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/10.0.Dockerfile b/10.0.Dockerfile
index c99bd55..b03b487 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 906b25b..f3f36c6 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 7651a28..e4dc82c 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
-- 
GitLab