From c5143f2faebbc453b27ffe06f4c3090ef374a0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Wed, 17 Jul 2024 16:01:02 +0200
Subject: [PATCH] feat(build): script to retrieve addons and save commit hashes
(backported from 16.0)
---
14.0.Dockerfile | 152 ++++++++++++++++++++++++------------------------
get_addons | 39 +++++++++++++
2 files changed, 116 insertions(+), 75 deletions(-)
create mode 100644 get_addons
diff --git a/14.0.Dockerfile b/14.0.Dockerfile
index 22800c1..44959ed 100644
--- a/14.0.Dockerfile
+++ b/14.0.Dockerfile
@@ -1,10 +1,12 @@
FROM python:3.9-slim-buster
MAINTAINER Le Filament <https://le-filament.com>
+ARG SAVE_COMMITS_DIR='/opt/odoo_commits/'
ENV APT_DEPS='build-essential libldap2-dev libpq-dev libsasl2-dev' \
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 &&\
@@ -33,88 +35,88 @@ RUN set -x; \
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 -l --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/14.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 '14.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 \
+ && echo "info: OCB commit:" \
+ && cat $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME
+
+# Add script to download Odoo addons.
+COPY --chown=root:root --chmod=755 ./get_addons /usr/local/bin
# Install Odoo OCA default dependencies
+ARG SAVE_COMMITS_FILENAME='default_addons'
RUN set -x; \
- mkdir -p /tmp/oca-repos/ &&\
- curl -L https://github.com/OCA/account-financial-reporting/tarball/14.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-financial-reporting" --strip-components 1 &&\
- mv /tmp/oca-repos/account-financial-reporting/account_tax_balance /opt/odoo/additional_addons/ &&\
- curl -L https://github.com/OCA/account-financial-tools/tarball/14.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_reconcile_show_boolean \
- /opt/odoo/additional_addons/ &&\
- curl -L https://github.com/OCA/account-invoicing/tarball/14.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/14.0 | tar -xzC /tmp/oca-repos/ --one-top-level="account-reconcile" --strip-components 1 &&\
- mv /tmp/oca-repos/account-reconcile/account_reconciliation_widget \
- /opt/odoo/additional_addons/ &&\
- curl -L https://github.com/OCA/bank-statement-import/tarball/14.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 \
- /tmp/oca-repos/bank-statement-import/account_statement_import_file_reconciliation_widget \
- /tmp/oca-repos/bank-statement-import/account_statement_import_ofx \
- /opt/odoo/additional_addons/ &&\
- curl -L https://github.com/OCA/crm/tarball/14.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/partner-contact/tarball/14.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/14.0 | tar -xzC /tmp/oca-repos/ --one-top-level="project" --strip-components 1 &&\
- mv /tmp/oca-repos/project/project_status \
- /tmp/oca-repos/project/project_task_default_stage \
- /tmp/oca-repos/project/project_template \
- /tmp/oca-repos/project/project_timeline \
- /opt/odoo/additional_addons/ &&\
- # Until migrated to OCA (https://github.com/OCA/project/pull/1016)
- curl -L https://github.com/lefilament/project/tarball/14.0-enh-project_category | tar -xzC /tmp/oca-repos/ --one-top-level="project-lf" --strip-components 1 &&\
- mv /tmp/oca-repos/project-lf/project_category /opt/odoo/additional_addons/ &&\
- curl -L https://github.com/OCA/server-auth/tarball/14.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/14.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/remove_odoo_enterprise \
- /opt/odoo/additional_addons/ &&\
- curl -L https://github.com/OCA/server-tools/tarball/14.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-tools" --strip-components 1 &&\
- mv /tmp/oca-repos/server-tools/base_search_fuzzy \
- /tmp/oca-repos/server-tools/module_change_auto_install \
- /opt/odoo/additional_addons/ &&\
- curl -L https://github.com/OCA/server-ux/tarball/14.0 | tar -xzC /tmp/oca-repos/ --one-top-level="server-ux" --strip-components 1 &&\
- mv /tmp/oca-repos/server-ux/base_technical_features \
- /tmp/oca-repos/server-ux/date_range \
- /tmp/oca-repos/server-ux/mass_editing \
- /opt/odoo/additional_addons/ &&\
- curl -L https://github.com/OCA/social/tarball/14.0 | tar -xzC /tmp/oca-repos/ --one-top-level="social" --strip-components 1 &&\
- 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/ &&\
- curl -L https://github.com/OCA/web/tarball/14.0 | tar -xzC /tmp/oca-repos/ --one-top-level="web" --strip-components 1 &&\
- 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 &&\
- # Install Le Filament default dependency
- git clone -b 14.0 --depth 1 https://sources.le-filament.com/lefilament/remove_login_links.git /opt/odoo/private_addons/remove_login_links &&\
- git clone -b 14.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
+ get_addons 'https://github.com/OCA/account-financial-reporting' '14.0' 'additional_addons' \
+ account_tax_balance \
+ && get_addons 'https://github.com/OCA/account-financial-tools' '14.0' 'additional_addons' \
+ account_lock_date_update \
+ account_move_name_sequence \
+ account_reconcile_show_boolean \
+ && get_addons 'https://github.com/OCA/account-invoicing' '14.0' 'additional_addons' \
+ sale_timesheet_invoice_description \
+ && get_addons 'https://github.com/OCA/account-reconcile' '14.0' 'additional_addons' \
+ account_reconciliation_widget \
+ && get_addons 'https://github.com/OCA/bank-statement-import' '14.0' 'additional_addons' \
+ account_statement_import_base \
+ account_statement_import \
+ account_statement_import_file_reconciliation_widget \
+ account_statement_import_ofx \
+ && get_addons 'https://github.com/OCA/crm' '14.0' 'additional_addons' \
+ crm_stage_probability \
+ && get_addons 'https://github.com/OCA/partner-contact' '14.0' 'additional_addons' \
+ partner_disable_gravatar \
+ partner_firstname \
+ && get_addons 'https://github.com/OCA/project' '14.0' 'additional_addons' \
+ project_status \
+ project_task_default_stage \
+ project_template \
+ project_timeline \
+ # Until migrated to OCA (https://github.com/OCA/project/pull/1016)
+ && get_addons 'https://github.com/lefilament/project' '14.0-enh-project_category' 'additional_addons' \
+ project_category \
+ && get_addons 'https://github.com/OCA/server-auth' '14.0' 'additional_addons' \
+ password_security \
+ && get_addons 'https://github.com/OCA/server-brand' '14.0' 'additional_addons' \
+ disable_odoo_online \
+ remove_odoo_enterprise \
+ && get_addons 'https://github.com/OCA/server-tools' '14.0' 'additional_addons' \
+ base_search_fuzzy \
+ module_change_auto_install \
+ && get_addons 'https://github.com/OCA/server-ux' '14.0' 'additional_addons' \
+ base_technical_features \
+ date_range \
+ mass_editing \
+ && get_addons 'https://github.com/OCA/social' '14.0' 'additional_addons' \
+ base_search_mail_content \
+ mail_debrand \
+ mail_tracking \
+ && get_addons 'https://github.com/OCA/web' '14.0' 'additional_addons' \
+ web_environment_ribbon \
+ web_responsive \
+ web_no_bubble \
+ web_timeline \
+ && find /opt/odoo/additional_addons/*/i18n/ -type f -not -name 'fr.po' -delete \
+ # Install Le Filament default dependency
+ && get_addons 'https://sources.le-filament.com/lefilament/remove_login_links.git' '14.0' 'private_addons/remove_login_links' \
+ && get_addons 'https://sources.le-filament.com/lefilament/lefilament_release_agent.git' '14.0' 'private_addons/lefilament_release_agent' \
+ && echo "info: default addon commits:" \
+ && cat $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME
# 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