diff --git a/16.0-scratch.Dockerfile b/16.0-scratch.Dockerfile index 1e50316c507a8dc036d7a4c8078b10cbb102c60d..9d75ea0e37d51310e111132225346fd13ef16340 100644 --- a/16.0-scratch.Dockerfile +++ b/16.0-scratch.Dockerfile @@ -142,13 +142,12 @@ RUN mkdir -p \ /tmp/oca-repos/server-ux \ && mv /tmp/oca-repos/server-ux/server_action_mass_edit \ /newroot/opt/odoo/additional_addons/ \ -# && git clone -b 16.0 --depth 1 \ -# https://github.com/OCA/social.git \ -# /tmp/oca-repos/social \ -# && mv /tmp/oca-repos/social/base_search_mail_content \ -# /tmp/oca-repos/social/mail_debrand \ # https://github.com/OCA/social/pull/1021 + && git clone -b 16.0 --depth 1 \ + https://github.com/OCA/social.git \ + /tmp/oca-repos/social \ + && mv /tmp/oca-repos/social/mail_debrand \ # /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1029 -# /newroot/opt/odoo/additional_addons/ \ + /newroot/opt/odoo/additional_addons/ \ && git clone -b 16.0 --depth 1 \ https://github.com/OCA/web.git \ /tmp/oca-repos/web \ diff --git a/16.0.Dockerfile b/16.0.Dockerfile index 37dd360097753b3779c2221028e6fe759e6543ea..0968b1205ffd3a5eff604aef62fe9da01b385ad8 100644 --- a/16.0.Dockerfile +++ b/16.0.Dockerfile @@ -115,10 +115,10 @@ RUN set -x; \ git clone -b 16.0 --depth 1 https://github.com/OCA/server-ux.git /tmp/oca-repos/server-ux &&\ mv /tmp/oca-repos/server-ux/server_action_mass_edit \ /opt/odoo/additional_addons/ &&\ -# git clone -b 16.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\ -# mv /tmp/oca-repos/social/mail_debrand \ # https://github.com/OCA/social/pull/1021 + git clone -b 16.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\ + mv /tmp/oca-repos/social/mail_debrand \ # /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1029 -# /opt/odoo/additional_addons/ &&\ + /opt/odoo/additional_addons/ &&\ git clone -b 16.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\ mv /tmp/oca-repos/web/web_environment_ribbon \ # /tmp/oca-repos/web/web_responsive \