From 5db0a5b88429fe1e6f4e839505ae3e2b7b6037f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20-=20Le=20Filament?= <theo@le-filament.com>
Date: Wed, 21 Aug 2024 18:28:13 +0200
Subject: [PATCH] fix: check if email_from is defined in crm (PR 1234)
---
14.0.Dockerfile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/14.0.Dockerfile b/14.0.Dockerfile
index 41d432f..bbcbe5a 100644
--- a/14.0.Dockerfile
+++ b/14.0.Dockerfile
@@ -43,7 +43,13 @@ 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 clone --single-branch --branch "${branch}" --depth 1 "${repo}" /tmp/repo \
+ && git clone --filter=tree:0 --branch "${branch}" "${repo}" /tmp/repo \
+ # FIX begin: Merge pull request https://github.com/OCA/OCB/pull/1234/files
+ && git -C /tmp/repo remote add odoolf https://github.com/lefilament/odoo \
+ && git -C /tmp/repo fetch odoolf 14.0-fix-crm_lead-email \
+ && git -C /tmp/repo checkout odoolf/14.0-fix-crm_lead-email \
+ && git -C /tmp/repo rebase origin/14.0 \
+ # FIX end
&& commit="$(git -C /tmp/repo rev-parse HEAD)" \
&& mv /tmp/repo/* /opt/odoo/odoo/ \
&& echo "${repo};${commit}" > $SAVE_COMMITS_DIR/$SAVE_COMMITS_FILENAME \
--
GitLab