From 238c1d2b0c9eb8a333fcd03f9fcb1d9cb0d37a88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com> Date: Mon, 18 Sep 2023 13:54:40 +0200 Subject: [PATCH] [UPD] improve download of repos by using tarball iso git clone --- 14.0.Dockerfile | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/14.0.Dockerfile b/14.0.Dockerfile index 6e2cffc..22800c1 100644 --- a/14.0.Dockerfile +++ b/14.0.Dockerfile @@ -36,70 +36,69 @@ COPY ./ssh_known_git_hosts /root/.ssh/known_hosts 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}" &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/OCB.git /opt/odoo/odoo &&\ - rm -rf /opt/odoo/odoo/.git &&\ + 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 # Install Odoo OCA default dependencies RUN set -x; \ mkdir -p /tmp/oca-repos/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/account-financial-reporting.git /tmp/oca-repos/account-financial-reporting &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/account-financial-tools.git /tmp/oca-repos/account-financial-tools &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/account-invoicing.git /tmp/oca-repos/account-invoicing &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/account-reconcile.git /tmp/oca-repos/account-reconcile &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/bank-statement-import.git /tmp/oca-repos/bank-statement-import &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/crm.git /tmp/oca-repos/crm &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/partner-contact.git /tmp/oca-repos/partner-contact &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/project.git /tmp/oca-repos/project &&\ + 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) - git clone -b 14.0-enh-project_category --depth 1 https://github.com/lefilament/project.git /tmp/oca-repos/project-lf &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/server-auth.git /tmp/oca-repos/server-auth &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/server-brand.git /tmp/oca-repos/server-brand &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/server-tools.git /tmp/oca-repos/server-tools &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/server-ux.git /tmp/oca-repos/server-ux &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\ + 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/ &&\ - git clone -b 14.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\ + 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 \ -- GitLab