From 7eb252abaa8b5c35ad609a2c4f52de28e73a1454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com> Date: Mon, 10 Jun 2024 18:56:53 +0200 Subject: [PATCH] feat(build): script to retrieve addons and save commit number --- 16.0.Dockerfile | 143 ++++++++++++++++++++++++------------------------ get_addons | 39 +++++++++++++ 2 files changed, 110 insertions(+), 72 deletions(-) create mode 100644 get_addons diff --git a/16.0.Dockerfile b/16.0.Dockerfile index 8f84ce8..7a381c6 100644 --- a/16.0.Dockerfile +++ b/16.0.Dockerfile @@ -14,9 +14,11 @@ RUN set -x; \ FROM python:3.11-slim-bullseye AS final +ARG SAVE_COMMITS_DIR='/opt/odoo_commits/' ENV LANG=C.UTF-8 \ LC_ALL=C.UTF-8 \ - PGDATABASE=odoo + PGDATABASE=odoo \ + SAVE_COMMITS_DIR=$SAVE_COMMITS_DIR RUN set -x; \ apt-get update &&\ @@ -44,85 +46,82 @@ RUN pip3 install --no-index --find-links=/svc/wheels -r https://raw.githubuserco COPY ./ssh_known_git_hosts /root/.ssh/known_hosts # Install Odoo and remove not French translations and .git directory to limit amount of data used by container +ARG SAVE_COMMITS_FILENAME='ocb' RUN set -x; \ - useradd --create-home --home-dir /opt/odoo --no-log-init odoo &&\ - /bin/bash -c "mkdir -p /opt/odoo/{etc,odoo,additional_addons,private_addons,data,private}" &&\ - curl -L https://github.com/OCA/OCB/tarball/16.0 | tar -xzC /opt/odoo/odoo --strip-components 1 &&\ - 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 + repo='https://github.com/OCA/OCB' \ + && useradd --create-home --home-dir /opt/odoo --no-log-init odoo \ + && /bin/bash -c "mkdir -p /opt/odoo/{etc,odoo,additional_addons,private_addons,data,private}" \ + && mkdir /opt/odoo_commits \ + && git clone --single-branch --branch '16.0' --depth 1 "${repo}" /tmp/repo \ + && commit="$(git -C /tmp/repo rev-parse HEAD)" \ + && mv /tmp/repo/* /opt/odoo/odoo/ \ + && echo "${repo};${commit}" > $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME \ + && rm -r /tmp/repo \ + # Only keep French translations. + && find /opt/odoo/odoo/addons/*/i18n/ /opt/odoo/odoo/odoo/addons/base/i18n/ -type f -not -name 'fr.po' -delete + +# Add script to download Odoo addons. +COPY --chown=root:root --chmod=755 ./get_addons /usr/local/bin # Install Odoo OCA default dependencies - Commented modules do not exist yet +ARG SAVE_COMMITS_FILENAME='default_addons' RUN set -x; \ - mkdir -p /tmp/oca-repos/ &&\ - curl -L https://github.com/OCA/account-financial-tools/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-financial-tools" --strip-components 1 &&\ - 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_usability \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/account-invoicing/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-invoicing" --strip-components 1 &&\ - mv /tmp/oca-repos/account-invoicing/sale_timesheet_invoice_description /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/account-reconcile/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-reconcile" --strip-components 1 &&\ - mv /tmp/oca-repos/account-reconcile/account_statement_base \ - /tmp/oca-repos/account-reconcile/account_reconcile_oca \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/bank-statement-import/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="bank-statement-import" --strip-components 1 &&\ - 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/ &&\ - curl -L https://github.com/OCA/crm/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="crm" --strip-components 1 &&\ - mv /tmp/oca-repos/crm/crm_stage_probability /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/l10n-france/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="l10n-france" --strip-components 1 &&\ - mv /tmp/oca-repos/l10n-france/l10n_fr_siret \ - /tmp/oca-repos/l10n-france/l10n_fr_siret_lookup \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/partner-contact/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="partner-contact" --strip-components 1 &&\ - mv /tmp/oca-repos/partner-contact/partner_disable_gravatar \ - /tmp/oca-repos/partner-contact/partner_firstname \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/project/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="project" --strip-components 1 &&\ - mv /tmp/oca-repos/project/project_task_default_stage \ - /tmp/oca-repos/project/project_template \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/server-auth/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-auth" --strip-components 1 &&\ - mv /tmp/oca-repos/server-auth/password_security \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/server-brand/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-brand" --strip-components 1 &&\ - mv /tmp/oca-repos/server-brand/disable_odoo_online \ - /tmp/oca-repos/server-brand/portal_odoo_debranding \ - /tmp/oca-repos/server-brand/remove_odoo_enterprise \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/server-tools/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-tools" --strip-components 1 &&\ - mv /tmp/oca-repos/server-tools/base_view_inheritance_extension \ - /tmp/oca-repos/server-tools/module_change_auto_install \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/server-ux/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-ux" --strip-components 1 &&\ - mv /tmp/oca-repos/server-ux/server_action_mass_edit \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/social/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="social" --strip-components 1 &&\ - mv /tmp/oca-repos/social/mail_debrand \ - /tmp/oca-repos/social/mail_tracking \ - /opt/odoo/additional_addons/ &&\ - curl -L https://github.com/OCA/web/tarball/16.0 | tar -xzC /tmp/oca-repos/ --one-top-level="web" --strip-components 1 &&\ - 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 \ - /tmp/oca-repos/web/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 &&\ - git clone -b 16.0 --depth 1 https://sources.le-filament.com/lefilament/restrict_access_rights.git /opt/odoo/private_addons/restrict_access_rights &&\ - chown -R odoo:odoo /opt/odoo + get_addons 'https://github.com/OCA/account-financial-tools' '16.0' 'additional_addons' \ + account_lock_date_update \ + account_move_name_sequence \ + account_usability \ + && get_addons 'https://github.com/OCA/account-invoicing' '16.0' 'additional_addons' \ + sale_timesheet_invoice_description \ + && get_addons 'https://github.com/OCA/account-reconcile' '16.0' 'additional_addons' \ + account_statement_base \ + account_reconcile_oca \ + && get_addons 'https://github.com/OCA/bank-statement-import' '16.0' 'additional_addons' \ + account_statement_import_base \ + account_statement_import_file \ + account_statement_import_ofx \ + && get_addons 'https://github.com/OCA/crm' '16.0' 'additional_addons' \ + crm_stage_probability \ + && get_addons 'https://github.com/OCA/l10n-france' '16.0' 'additional_addons' \ + l10n_fr_siret \ + l10n_fr_siret_lookup \ + && get_addons 'https://github.com/OCA/partner-contact' '16.0' 'additional_addons' \ + partner_disable_gravatar \ + partner_firstname \ + && get_addons 'https://github.com/OCA/project' '16.0' 'additional_addons' \ + project_task_default_stage \ + project_template \ + && get_addons 'https://github.com/OCA/server-auth' '16.0' 'additional_addons' \ + password_security \ + && get_addons 'https://github.com/OCA/server-brand' '16.0' 'additional_addons' \ + disable_odoo_online \ + portal_odoo_debranding \ + remove_odoo_enterprise \ + && get_addons 'https://github.com/OCA/server-tools' '16.0' 'additional_addons' \ + base_view_inheritance_extension \ + module_change_auto_install \ + && get_addons 'https://github.com/OCA/server-ux' '16.0' 'additional_addons' \ + server_action_mass_edit \ + && get_addons 'https://github.com/OCA/social' '16.0' 'additional_addons' \ + mail_debrand \ + mail_tracking \ + && get_addons 'https://github.com/OCA/web' '16.0' 'additional_addons' \ + web_chatter_position \ + web_environment_ribbon \ + web_refresher \ + web_responsive \ + web_no_bubble \ + web_theme_classic \ + # Only keep French translations. + && find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \ + # Install Le Filament default addons. + && get_addons 'https://sources.le-filament.com/lefilament/remove_login_links.git' '16.0' 'private_addons/remove_login_links' \ + && get_addons 'https://sources.le-filament.com/lefilament/lefilament_release_agent.git' '16.0' 'private_addons/lefilament_release_agent' \ + && get_addons 'https://sources.le-filament.com/lefilament/restrict_access_rights.git' '16.0' 'private_addons/restrict_access_rights' # Copy entrypoint script and Odoo configuration file COPY ./entrypoint.sh / COPY ./odoo.conf /opt/odoo/etc/odoo.conf -RUN chown odoo:odoo /opt/odoo/etc/odoo.conf +RUN chown -R odoo:odoo /opt/odoo # Mount /opt/odoo/data to allow restoring filestore VOLUME ["/opt/odoo/data/"] diff --git a/get_addons b/get_addons new file mode 100644 index 0000000..b3e52d4 --- /dev/null +++ b/get_addons @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +ODOO_ROOT_DIR=${ODOO_ROOT_DIR:-'/opt/odoo'} +SAVE_COMMITS_DIR=${SAVE_COMMITS_DIR:-'/opt/odoo_commits'} +SAVE_COMMITS_FILENAME=${SAVE_COMMITS_FILENAME:-'custom_addons'} + +save_commit() { + repo="$1" + commit="$2" + module="$3" + dst="$4" + echo "${repo};${commit};${module};${dst}" >> "${SAVE_COMMITS_DIR}/${SAVE_COMMITS_FILENAME}" +} + +repo="$1" +shift +ref="$1" +shift +dst="$1" +shift +modules="$@" + +git clone --filter=tree:0 "${repo}" /tmp/repo +git -C /tmp/repo checkout "${ref}" +commit="$(git -C /tmp/repo rev-parse HEAD)" +if [ -n "$modules" ]; then + for module in $modules; do + mv "/tmp/repo/${module}" "${ODOO_ROOT_DIR}/${dst}/" + save_commit "$repo" "$commit" "$module" "$dst" + done +else + module="$(basename $dst)" + mkdir -p "/${ODOO_ROOT_DIR}/${dst}" + mv /tmp/repo/* "${ODOO_ROOT_DIR}/${dst}/" + save_commit "$repo" "$commit" "$module" "$dst" +fi +rm -r /tmp/repo -- GitLab