diff --git a/16.0-scratch.Dockerfile b/16.0-scratch.Dockerfile index 969c23d4fe6d854d1c4e04865e59546eada9369f..13ee9363754c7e07f775bc14fa3835906807ab4b 100644 --- a/16.0-scratch.Dockerfile +++ b/16.0-scratch.Dockerfile @@ -134,7 +134,7 @@ RUN mkdir -p \ && mv /tmp/oca-repos/web/web_chatter_position \ /tmp/oca-repos/web/web_environment_ribbon \ /tmp/oca-repos/web/web_responsive \ -# /tmp/oca-repos/web/web_no_bubble \ + /tmp/oca-repos/web/web_no_bubble \ /tmp/oca-repos/web/web_refresher \ /tmp/oca-repos/web/web_theme_classic \ /newroot/opt/odoo/additional_addons/ \ diff --git a/16.0.Dockerfile b/16.0.Dockerfile index 0578177a173fe26505737b74edf578aaa1920712..5487b85a6446c6c130ca86adbfcea55613c2a54f 100644 --- a/16.0.Dockerfile +++ b/16.0.Dockerfile @@ -118,16 +118,12 @@ RUN set -x; \ mv /tmp/oca-repos/social/mail_debrand \ # /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1091 /opt/odoo/additional_addons/ &&\ - # Until migrated to OCA (https://github.com/OCA/web/pull/2462) - git clone -b 16_mig_web_no_bubble --depth 1 https://github.com/onesteinbv/web.git /tmp/oca-repos/web-onestein &&\ - mv /tmp/oca-repos/web-onestein/web_no_bubble \ - /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_chatter_position \ /tmp/oca-repos/web/web_environment_ribbon \ /tmp/oca-repos/web/web_refresher \ /tmp/oca-repos/web/web_responsive \ -# /tmp/oca-repos/web/web_no_bubble \ # https://github.com/OCA/social/pull/2462 + /tmp/oca-repos/web/web_no_bubble \ /tmp/oca-repos/web/web_theme_classic \ /opt/odoo/additional_addons/ &&\ rm -rf /tmp/oca-repos/ &&\