From 5f1f944ec757eb4c9efad153adf193f34517e5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Mon, 20 Jan 2025 15:30:31 +0100
Subject: [PATCH] [FIX] missing username/mail for git
---
14.0.Dockerfile | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/14.0.Dockerfile b/14.0.Dockerfile
index 9be500e..f8906dd 100644
--- a/14.0.Dockerfile
+++ b/14.0.Dockerfile
@@ -43,16 +43,18 @@ 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}" \
&& mkdir /opt/odoo_commits \
+ && git config --global user.email "maintenance@le-filament.com" \
+ && git config --global user.name "Le Filament" \
&& git clone --filter=tree:0 --branch "${branch}" "${repo}" /tmp/repo \
- && commit="$(git -C /tmp/repo rev-parse HEAD)" \
- # FIX begin: Merge pull request https://github.com/OCA/OCB/pull/1234
- && git -C /tmp/repo fetch origin pull/1234/head:14.0-fix-crm_lead-email \
- && git -C /tmp/repo checkout 14.0-fix-crm_lead-email \
- && git -C /tmp/repo rebase origin/${branch} \
- # FIX end
- && mv /tmp/repo/* /opt/odoo/odoo/ \
- && echo "repo;ref;commit" > $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME \
- && echo "${repo};${branch};${commit}" >> $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME \
+ && commit="$(git -C /tmp/repo rev-parse HEAD)" \
+ # FIX begin: Merge pull request https://github.com/OCA/OCB/pull/1234
+ && git -C /tmp/repo fetch origin pull/1234/head:14.0-fix-crm_lead-email \
+ && git -C /tmp/repo checkout 14.0-fix-crm_lead-email \
+ && git -C /tmp/repo rebase origin/${branch} \
+ # FIX end
+ && mv /tmp/repo/* /opt/odoo/odoo/ \
+ && echo "repo;ref;commit" > $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME \
+ && echo "${repo};${branch};${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 \
--
GitLab