From 1a1341a84b91e623a87c2d6de83c42b3801acd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com> Date: Wed, 9 Nov 2022 08:22:15 +0100 Subject: [PATCH] [ADD] modules available in v16 --- 16.0-scratch.Dockerfile | 68 ++++++++++++++++++++--------------------- 16.0.Dockerfile | 54 ++++++++++++++++---------------- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/16.0-scratch.Dockerfile b/16.0-scratch.Dockerfile index 46e59a9..4faa20f 100644 --- a/16.0-scratch.Dockerfile +++ b/16.0-scratch.Dockerfile @@ -46,13 +46,13 @@ RUN git clone -b 16.0 --depth 1 https://github.com/OCA/OCB.git /newroot/opt/odoo && find /newroot/opt/odoo/odoo/addons/*/i18n/ /newroot/opt/odoo/odoo/odoo/addons/base/i18n/ -type f -not -name 'fr.po' -delete ## Add Git known hosts. -#COPY ./ssh_known_git_hosts /root/.ssh/known_hosts -# +COPY ./ssh_known_git_hosts /root/.ssh/known_hosts + ## Install Odoo OCA and Le Filament default dependencies. -#RUN mkdir -p \ -# /tmp/oca-repos/ \ -# /newroot/opt/odoo/additional_addons \ -# /newroot/opt/odoo/private_addons \ +RUN mkdir -p \ + /tmp/oca-repos/ \ + /newroot/opt/odoo/additional_addons \ + /newroot/opt/odoo/private_addons \ # && git clone -b 16.0 --depth 1 \ # https://github.com/OCA/account-financial-reporting.git \ # /tmp/oca-repos/account-financial-reporting \ @@ -86,21 +86,21 @@ RUN git clone -b 16.0 --depth 1 https://github.com/OCA/OCB.git /newroot/opt/odoo # /tmp/oca-repos/crm \ # && mv /tmp/oca-repos/crm/crm_stage_probability \ # /newroot/opt/odoo/additional_addons/ \ -# && git clone -b 16.0 --depth 1 \ -# https://github.com/OCA/partner-contact.git \ -# /tmp/oca-repos/partner-contact \ -# && mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \ -# /tmp/oca-repos/partner-contact/partner_firstname \ -# /newroot/opt/odoo/additional_addons/ \ -# && git clone -b 16.0 --depth 1 \ -# https://github.com/OCA/project.git \ -# /tmp/oca-repos/project \ + && git clone -b 16.0 --depth 1 \ + https://github.com/OCA/partner-contact.git \ + /tmp/oca-repos/partner-contact \ + && mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \ + /tmp/oca-repos/partner-contact/partner_firstname \ + /newroot/opt/odoo/additional_addons/ \ + && git clone -b 16.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 \ + && mv /tmp/oca-repos/project/project_template \ # /tmp/oca-repos/project/project_timeline \ -# /newroot/opt/odoo/additional_addons/ \ + /newroot/opt/odoo/additional_addons/ \ # && git clone -b 16.0 --depth 1 \ # https://github.com/OCA/server-auth.git \ # /tmp/oca-repos/server-auth \ @@ -112,19 +112,19 @@ RUN git clone -b 16.0 --depth 1 https://github.com/OCA/OCB.git /newroot/opt/odoo # && mv /tmp/oca-repos/server-brand/disable_odoo_online \ # /tmp/oca-repos/server-brand/remove_odoo_enterprise \ # /newroot/opt/odoo/additional_addons/ \ -# && git clone -b 16.0 --depth 1 \ -# https://github.com/OCA/server-tools.git \ -# /tmp/oca-repos/server-tools \ + && git clone -b 16.0 --depth 1 \ + https://github.com/OCA/server-tools.git \ + /tmp/oca-repos/server-tools \ # && mv /tmp/oca-repos/server-tools/base_search_fuzzy \ -# /tmp/oca-repos/server-tools/module_change_auto_install \ -# /newroot/opt/odoo/additional_addons/ \ -# && git clone -b 16.0 --depth 1 \ -# https://github.com/OCA/server-ux.git \ -# /tmp/oca-repos/server-ux \ + && mv /tmp/oca-repos/server-tools/module_change_auto_install \ + /newroot/opt/odoo/additional_addons/ \ + && 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/base_technical_features \ -# /tmp/oca-repos/server-ux/date_range \ + && mv /tmp/oca-repos/server-ux/date_range \ # /tmp/oca-repos/server-ux/mass_editing \ -# /newroot/opt/odoo/additional_addons/ \ + /newroot/opt/odoo/additional_addons/ \ # && git clone -b 16.0 --depth 1 \ # https://github.com/OCA/social.git \ # /tmp/oca-repos/social \ @@ -132,16 +132,16 @@ RUN git clone -b 16.0 --depth 1 https://github.com/OCA/OCB.git /newroot/opt/odoo # /tmp/oca-repos/social/mail_debrand \ # /tmp/oca-repos/social/mail_tracking \ # /newroot/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 \ + && 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 \ # /tmp/oca-repos/web/web_no_bubble \ # /tmp/oca-repos/web/web_timeline \ -# /newroot/opt/odoo/additional_addons/ \ -# && rm -rf /tmp/oca-repos/ \ -# && find /newroot/opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \ + /newroot/opt/odoo/additional_addons/ \ + && rm -rf /tmp/oca-repos/ \ + && find /newroot/opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \ # && git clone -b 16.0 --depth 1 \ # https://sources.le-filament.com/lefilament/remove_login_links.git \ # /newroot/opt/odoo/private_addons/remove_login_links \ diff --git a/16.0.Dockerfile b/16.0.Dockerfile index ece96cf..e7dc03e 100644 --- a/16.0.Dockerfile +++ b/16.0.Dockerfile @@ -46,21 +46,18 @@ RUN set -x; \ find /opt/odoo/odoo/addons/*/i18n/ /opt/odoo/odoo/odoo/addons/base/i18n/ -type f -not -name 'fr.po' -delete &&\ chown -R odoo:odoo /opt/odoo -# Install Odoo OCA default dependencies - These modules do not exist for now -#RUN set -x; \ -# mkdir -p /tmp/oca-repos/ &&\ +# Install Odoo OCA default dependencies - Commented modules do not exist yet +RUN set -x; \ + mkdir -p /tmp/oca-repos/ &&\ # git clone -b 16.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 16.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 \ # /tmp/oca-repos/account-financial-tools/account_move_name_sequence \ +# /tmp/oca-repos/account-financial-tools/account_reconcile_show_boolean \ # /opt/odoo/additional_addons/ &&\ -# # Until migrated to OCA (https://github.com/OCA/account-financial-tools/pull/1304) -# git clone -b 16.0-add-partner_account_reconciliable --depth 1 https://github.com/lefilament/account-financial-tools.git /tmp/oca-repos/account-financial-tools-lf &&\ -# mv /tmp/oca-repos/account-financial-tools-lf/partner_account_reconciliable /opt/odoo/additional_addons/ &&\ -# # Until migrated to OCA (https://github.com/OCA/account-invoicing/pull/897) -# git clone -b 16.0-mig-sale-timesheet-invoice-description --depth 1 https://github.com/akretion/account-invoicing.git /tmp/oca-repos/account-invoicing-ak &&\ -# mv /tmp/oca-repos/account-invoicing-ak/sale_timesheet_invoice_description \ +# git clone -b 16.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 16.0 --depth 1 https://github.com/OCA/account-reconcile.git /tmp/oca-repos/account-reconcile &&\ # mv /tmp/oca-repos/account-reconcile/account_reconciliation_widget \ @@ -71,17 +68,17 @@ RUN set -x; \ # /opt/odoo/additional_addons/ &&\ # git clone -b 16.0 --depth 1 https://github.com/OCA/crm.git /tmp/oca-repos/crm &&\ # mv /tmp/oca-repos/crm/crm_stage_probability /opt/odoo/additional_addons/ &&\ -# git clone -b 16.0 --depth 1 https://github.com/OCA/partner-contact.git /tmp/oca-repos/partner-contact &&\ -# mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \ -# /tmp/oca-repos/partner-contact/partner_firstname \ -# /opt/odoo/additional_addons/ &&\ -# git clone -b 16.0 --depth 1 https://github.com/OCA/project.git /tmp/oca-repos/project &&\ + git clone -b 16.0 --depth 1 https://github.com/OCA/partner-contact.git /tmp/oca-repos/partner-contact &&\ + mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \ + /tmp/oca-repos/partner-contact/partner_firstname \ + /opt/odoo/additional_addons/ &&\ + git clone -b 16.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 \ + mv /tmp/oca-repos/project/project_template \ # /tmp/oca-repos/project/project_timeline \ -# /opt/odoo/additional_addons/ &&\ + /opt/odoo/additional_addons/ &&\ # git clone -b 16.0 --depth 1 https://github.com/OCA/server-auth.git /tmp/oca-repos/server-auth &&\ # mv /tmp/oca-repos/server-auth/password_security \ # /opt/odoo/additional_addons/ &&\ @@ -89,29 +86,32 @@ RUN set -x; \ # mv /tmp/oca-repos/server-brand/disable_odoo_online \ # /tmp/oca-repos/server-brand/remove_odoo_enterprise \ # /opt/odoo/additional_addons/ &&\ -# git clone -b 16.0 --depth 1 https://github.com/OCA/server-tools.git /tmp/oca-repos/server-tools &&\ + git clone -b 16.0 --depth 1 https://github.com/OCA/server-tools.git /tmp/oca-repos/server-tools &&\ # mv /tmp/oca-repos/server-tools/base_search_fuzzy \ -# /opt/odoo/additional_addons/ &&\ -# git clone -b 16.0 --depth 1 https://github.com/OCA/server-ux.git /tmp/oca-repos/server-ux &&\ + mv /tmp/oca-repos/server-tools/module_change_auto_install \ + /opt/odoo/additional_addons/ &&\ + 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/base_technical_features \ -# /tmp/oca-repos/server-ux/date_range \ + mv /tmp/oca-repos/server-ux/date_range \ # /tmp/oca-repos/server-ux/mass_editing \ -# /opt/odoo/additional_addons/ &&\ + /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 \ +# /tmp/oca-repos/social/mail_tracking \ # /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 \ + 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 \ # /tmp/oca-repos/web/web_no_bubble \ # /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 &&\ + /opt/odoo/additional_addons/ &&\ + rm -rf /tmp/oca-repos/ &&\ + find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete &&\ # # Install Le Filament default dependency # git clone -b 16.0 --depth 1 https://sources.le-filament.com/lefilament/remove_login_links.git /opt/odoo/private_addons/remove_login_links &&\ -# chown -R odoo:odoo /opt/odoo +# git clone -b 16.0 --depth 1 https://sources.le-filament.com/lefilament/lefilament_release_agent.git /opt/odoo/private_addons/lefilament_release_agent &&\ + chown -R odoo:odoo /opt/odoo # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / -- GitLab