Skip to content
Snippets Groups Projects
Commit 30f9225e authored by Rémi - Le Filament's avatar Rémi - Le Filament
Browse files

[UPD] rework default modules and dependencies

parent 746877c1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
16.0-scratch.Dockerfile
+ 44
− 27
View file @ 30f9225e
......@@ -53,32 +53,40 @@ 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 \
&& mv /tmp/oca-repos/account-financial-reporting/account_tax_balance \
/newroot/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 \
# && mv /tmp/oca-repos/account-financial-tools/account_lock_date_update \ # https://github.com/OCA/account-financial-tools/pull/1526
&& mv /tmp/oca-repos/account-financial-tools/account_move_name_sequence \
# /tmp/oca-repos/account-financial-tools/account_reconcile_show_boolean \
/tmp/oca-repos/account-financial-tools/account_usability \
/newroot/opt/odoo/additional_addons/ \
# && 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 \
# /newroot/opt/odoo/additional_addons/ \
# Until migrated to OCA (https://github.com/OCA/account-reconcile/pull/500)
&& git clone -b 16.0-add-account_reconcile_oca --depth 1 \
https://github.com/tegin/account-reconcile.git \
/tmp/oca-repos/account-reconcile \
&& mv /tmp/oca-repos/account-reconcile/account_reconcile_oca \
/newroot/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 \
# /newroot/opt/odoo/additional_addons/ \
# Until migrated to OCA (https://github.com/OCA/bank-statement-import/pull/535)
&& git clone -b 16.0-mig-account_statement_import --depth 1 \
https://github.com/sonhd91/bank-statement-import.git \
/tmp/oca-repos/bank-statement-import \
&& mv /tmp/oca-repos/bank-statement-import/account_statement_import_base \
/tmp/oca-repos/bank-statement-import/account_statement_import_file \
/newroot/opt/odoo/additional_addons/ \
# && git clone -b 16.0 --depth 1 \
# https://github.com/OCA/bank-statement-import.git \
# /tmp/oca-repos/bank-statement-import \
# && mv /tmp/oca-repos/bank-statement-import/account_statement_import \
# && mv /tmp/oca-repos/bank-statement-import/account_statement_import_base \
# /tmp/oca-repos/bank-statement-import/account_statement_import_file \
# /tmp/oca-repos/bank-statement-import/account_statement_import_ofx \
# /newroot/opt/odoo/additional_addons/ \
# && git clone -b 16.0 --depth 1 \
......@@ -86,6 +94,12 @@ RUN mkdir -p \
# /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/l10n-france.git \
/tmp/oca-repos/l10n-france \
&& mv /tmp/oca-repos/l10n-france/l10n_fr_siret \
/tmp/oca-repos/l10n-france/l10n_fr_siret_lookup \
/newroot/opt/odoo/additional_addons/ &&\
&& git clone -b 16.0 --depth 1 \
https://github.com/OCA/partner-contact.git \
/tmp/oca-repos/partner-contact \
......@@ -95,11 +109,8 @@ RUN mkdir -p \
&& 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 \
&& mv /tmp/oca-repos/project/project_task_default_stage \
/tmp/oca-repos/project/project_template \
# /tmp/oca-repos/project/project_timeline \
/newroot/opt/odoo/additional_addons/ \
# && git clone -b 16.0 --depth 1 \
# https://github.com/OCA/server-auth.git \
......@@ -115,22 +126,20 @@ RUN mkdir -p \
&& 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 \
&& mv /tmp/oca-repos/server-tools/module_change_auto_install \
&& mv /tmp/oca-repos/server-tools/base_view_inheritance_extension \
/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 \
# /tmp/oca-repos/server-ux/mass_editing \
&& 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 \
# /tmp/oca-repos/social/mail_tracking \
# /tmp/oca-repos/social/mail_debrand \ # https://github.com/OCA/social/pull/1021
# /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1029
# /newroot/opt/odoo/additional_addons/ \
&& git clone -b 16.0 --depth 1 \
https://github.com/OCA/web.git \
......@@ -138,22 +147,30 @@ RUN mkdir -p \
&& 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 \
/tmp/oca-repos/web/web_refresher \
/tmp/oca-repos/web/web_theme_classic \
/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 \
# && git clone -b 16.0 --depth 1 \
# https://sources.le-filament.com/lefilament/lefilament_release_agent.git \
# /newroot/opt/odoo/private_addons/lefilament_release_agent
&& 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 \
&& git clone -b 16.0 --depth 1 \
https://sources.le-filament.com/lefilament/lefilament_release_agent.git \
/newroot/opt/odoo/private_addons/lefilament_release_agent
# Fix a ldap library bug.
RUN echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so
# Install Python requirements.
RUN pip install --requirement /newroot/opt/odoo/odoo/requirements.txt
RUN pip install --requirement /newroot/opt/odoo/odoo/requirements.txt \
# astor required by base_view_inheritance_extension
# openupgradelib required for OCA module migration from one version to another
# phonenumbers required by phone_validation
# python-stdnum>=1.18 required by l10n_fr_siret and l10n_fr_siret_lookup
# PyYAML required by custom scripts for adding modules (https://sources.le-filament.com/lefilament/ansible-roles/docker_odoo/-/tree/master/templates)
# zxcvbn required by password_security
pip install astor openupgradelib phonenumbers python-stdnum>=1.18 PyYAML zxcvbn
# Only copy libraries of needed binaries to new root.
RUN ls \
......
16.0.Dockerfile
+ 34
− 20
View file @ 30f9225e
......@@ -4,7 +4,13 @@ RUN set -x; \
apt-get install -y --no-install-recommends build-essential libldap2-dev libpq-dev libsasl2-dev &&\
pip install wheel &&\
pip wheel --wheel-dir=/svc/wheels -r https://raw.githubusercontent.com/oca/OCB/16.0/requirements.txt &&\
pip wheel --wheel-dir=/svc/wheels phonenumbers simplejson openupgradelib PyYAML
# astor required by base_view_inheritance_extension
# openupgradelib required for OCA module migration from one version to another
# phonenumbers required by phone_validation
# python-stdnum>=1.18 required by l10n_fr_siret and l10n_fr_siret_lookup
# PyYAML required by custom scripts for adding modules (https://sources.le-filament.com/lefilament/ansible-roles/docker_odoo/-/tree/master/templates)
# zxcvbn required by password_security
pip wheel --wheel-dir=/svc/wheels astor openupgradelib phonenumbers python-stdnum>=1.18 PyYAML zxcvbn
FROM python:3.10-slim-bullseye AS final
......@@ -49,35 +55,45 @@ RUN set -x; \
# 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 \
# mv /tmp/oca-repos/account-financial-tools/account_lock_date_update \ # https://github.com/OCA/account-financial-tools/pull/1526
mv /tmp/oca-repos/account-financial-tools/account_move_name_sequence \
# /tmp/oca-repos/account-financial-tools/account_reconcile_show_boolean \
/tmp/oca-repos/account-financial-tools/account_usability \
/opt/odoo/additional_addons/ &&\
# 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/ &&\
# Until migrated to OCA (https://github.com/OCA/account-reconcile/pull/500)
git clone -b 16.0-add-account_reconcile_oca --depth 1 https://github.com/tegin/account-reconcile.git /tmp/oca-repos/account-reconcile &&\
mv /tmp/oca-repos/account-reconcile/account_reconcile_oca \
/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 \
# /opt/odoo/additional_addons/ &&\
# Until migrated to OCA (https://github.com/OCA/bank-statement-import/pull/535)
git clone -b 16.0-mig-account_statement_import --depth 1 https://github.com/sonhd91/bank-statement-import.git /tmp/oca-repos/bank-statement-import &&\
mv /tmp/oca-repos/bank-statement-import/account_statement_import_base \
/tmp/oca-repos/bank-statement-import/account_statement_import_file \
/opt/odoo/additional_addons/ &&\
# git clone -b 16.0 --depth 1 https://github.com/OCA/bank-statement-import.git /tmp/oca-repos/bank-statement-import &&\
# mv /tmp/oca-repos/bank-statement-import/account_statement_import \
# mv /tmp/oca-repos/bank-statement-import/account_statement_import_base \
# /tmp/oca-repos/bank-statement-import/account_statement_import_file \
# /tmp/oca-repos/bank-statement-import/account_statement_import_ofx \
# /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/l10n-france.git /tmp/oca-repos/l10n-france &&\
mv /tmp/oca-repos/l10n-france/l10n_fr_siret \
/tmp/oca-repos/l10n-france/l10n_fr_siret_lookup \
/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 &&\
# mv /tmp/oca-repos/project/project_category \
# /tmp/oca-repos/project/project_status \
mv /tmp/oca-repos/project/project_task_default_stage \
/tmp/oca-repos/project/project_template \
# /tmp/oca-repos/project/project_timeline \
/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 \
......@@ -87,30 +103,28 @@ RUN set -x; \
# /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 &&\
# mv /tmp/oca-repos/server-tools/base_search_fuzzy \
mv /tmp/oca-repos/server-tools/module_change_auto_install \
mv /tmp/oca-repos/server-tools/base_view_inheritance_extension \
/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 \
# /tmp/oca-repos/server-ux/mass_editing \
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/base_search_mail_content \
# /tmp/oca-repos/social/mail_debrand \
# /tmp/oca-repos/social/mail_tracking \
# mv /tmp/oca-repos/social/mail_debrand \ # https://github.com/OCA/social/pull/1021
# /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1029
# /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 \
# /tmp/oca-repos/web/web_no_bubble \
# /tmp/oca-repos/web/web_timeline \
/tmp/oca-repos/web_refresher \
/tmp/oca-repos/web_theme_classic \
/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 &&\
# git clone -b 16.0 --depth 1 https://sources.le-filament.com/lefilament/lefilament_release_agent.git /opt/odoo/private_addons/lefilament_release_agent &&\
# 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 &&\
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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment