diff --git a/14.0.Dockerfile b/14.0.Dockerfile index 41d432f2da7d6f10dd1846c6e7bb34e405eb9722..bbcbe5aec45e8bf3448e045bcaa8d10602c70400 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 \