From ce46687ec6434c865074d2756cac66a60724bc62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Thu, 9 Feb 2023 12:42:07 +0100
Subject: [PATCH] [UPD] server-brand PRs merged
---
16.0-scratch.Dockerfile | 9 +--------
16.0.Dockerfile | 9 ++-------
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/16.0-scratch.Dockerfile b/16.0-scratch.Dockerfile
index 9d75ea0..a1b86e9 100644
--- a/16.0-scratch.Dockerfile
+++ b/16.0-scratch.Dockerfile
@@ -117,15 +117,8 @@ RUN mkdir -p \
# /tmp/oca-repos/server-auth \
# && mv /tmp/oca-repos/server-auth/password_security \
# /newroot/opt/odoo/additional_addons/ \
-# && git clone -b 16.0 --depth 1 \
-# https://github.com/OCA/server-brand.git \
-# /tmp/oca-repos/server-brand \
-# && mv /tmp/oca-repos/server-brand/disable_odoo_online \
-# /tmp/oca-repos/server-brand/remove_odoo_enterprise \
-# /newroot/opt/odoo/additional_addons/ \
- # Until migrated to OCA (https://github.com/OCA/server-brand/pulls)
&& git clone -b 16.0 --depth 1 \
- https://github.com/lefilament/server-brand.git \
+ https://github.com/OCA/server-brand.git \
/tmp/oca-repos/server-brand \
&& mv /tmp/oca-repos/server-brand/disable_odoo_online \
/tmp/oca-repos/server-brand/portal_odoo_debranding \
diff --git a/16.0.Dockerfile b/16.0.Dockerfile
index 0968b12..6918bec 100644
--- a/16.0.Dockerfile
+++ b/16.0.Dockerfile
@@ -98,12 +98,7 @@ RUN set -x; \
# git clone -b 16.0 --depth 1 https://github.com/OCA/server-auth.git /tmp/oca-repos/server-auth &&\
# mv /tmp/oca-repos/server-auth/password_security \
# /opt/odoo/additional_addons/ &&\
-# git clone -b 16.0 --depth 1 https://github.com/OCA/server-brand.git /tmp/oca-repos/server-brand &&\
-# mv /tmp/oca-repos/server-brand/disable_odoo_online \
-# /tmp/oca-repos/server-brand/remove_odoo_enterprise \
-# /opt/odoo/additional_addons/ &&\
- # Until migrated to OCA (https://github.com/OCA/server-brand/pulls)
- git clone -b 16.0 --depth 1 https://github.com/lefilament/server-brand.git /tmp/oca-repos/server-brand &&\
+ git clone -b 16.0 --depth 1 https://github.com/OCA/server-brand.git /tmp/oca-repos/server-brand &&\
mv /tmp/oca-repos/server-brand/disable_odoo_online \
/tmp/oca-repos/server-brand/portal_odoo_debranding \
/tmp/oca-repos/server-brand/remove_odoo_enterprise \
@@ -116,7 +111,7 @@ RUN set -x; \
mv /tmp/oca-repos/server-ux/server_action_mass_edit \
/opt/odoo/additional_addons/ &&\
git clone -b 16.0 --depth 1 https://github.com/OCA/social.git /tmp/oca-repos/social &&\
- mv /tmp/oca-repos/social/mail_debrand \
+ mv /tmp/oca-repos/social/mail_debrand \
# /tmp/oca-repos/social/mail_tracking \ # https://github.com/OCA/social/pull/1029
/opt/odoo/additional_addons/ &&\
git clone -b 16.0 --depth 1 https://github.com/OCA/web.git /tmp/oca-repos/web &&\
--
GitLab