From 7fb1872524fa8637e2ca29532ec1ba19e832f921 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Fri, 18 Feb 2022 15:02:58 +0100
Subject: [PATCH] [IMP]Odoo 14 DEV : allow ipython

Also simplify / remove useless PATH on odoo14/15
---
 odoo/odoo/Dockerfile.14     | 6 ++----
 odoo/odoo/Dockerfile.14.dev | 6 +++++-
 odoo/odoo/Dockerfile.15     | 6 ++----
 odoo/odoo/shell12.sh        | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/odoo/odoo/Dockerfile.14 b/odoo/odoo/Dockerfile.14
index ba399b2..4e6eb98 100644
--- a/odoo/odoo/Dockerfile.14
+++ b/odoo/odoo/Dockerfile.14
@@ -68,11 +68,9 @@ WORKDIR /opt/odoo
 USER odoo
 RUN mkdir pipcache data backups extra-addons custom-addons
 RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git
-# PATH update
-RUN echo 'export PATH="$PATH:$HOME/.local/bin/"' >> /opt/odoo/.profile
 RUN pip3 install --user -U pip
-RUN .local/bin/pip3 install --user -r OCB/requirements.txt
-RUN .local/bin/pip3 install --user phonenumbers
+RUN pip3 install --user -r OCB/requirements.txt
+RUN pip3 install --user phonenumbers
 
 # Launch scripts
 COPY ./launch14.sh ./launch.sh
diff --git a/odoo/odoo/Dockerfile.14.dev b/odoo/odoo/Dockerfile.14.dev
index 63dfd15..f92a227 100644
--- a/odoo/odoo/Dockerfile.14.dev
+++ b/odoo/odoo/Dockerfile.14.dev
@@ -5,7 +5,11 @@ MAINTAINER Yaltik - Fabien Bourgeois <fabien@yaltik.com>
 # RUN .local/bin/pip3 install --user pgcli
 # COPY pgcli.sh ./
 # Odoo specific
-RUN .local/bin/pip3 install --user watchdog
+RUN pip3 install --user watchdog
+RUN pip3 install --user ipython
+RUN mkdir -p /opt/odoo/.ipython/profile_default
+COPY ipython_config.py ./.ipython/profile_default/
+COPY shell_helpers.py ./
 COPY shell12.sh ./shell.sh
 COPY i18n.sh ./i18n.sh
 COPY launch12.dev.sh ./launch.sh
diff --git a/odoo/odoo/Dockerfile.15 b/odoo/odoo/Dockerfile.15
index 68462eb..cdad861 100644
--- a/odoo/odoo/Dockerfile.15
+++ b/odoo/odoo/Dockerfile.15
@@ -54,11 +54,9 @@ WORKDIR /opt/odoo
 USER odoo
 RUN mkdir pipcache data backups extra-addons custom-addons
 RUN git clone -b ${ODOO_BRANCH} --depth 1 https://github.com/OCA/OCB.git
-# PATH update
-RUN echo 'export PATH="$PATH:$HOME/.local/bin/"' >> /opt/odoo/.profile
 RUN pip3 install --user -U pip
-RUN .local/bin/pip3 install --user -r OCB/requirements.txt
-RUN .local/bin/pip3 install --user phonenumbers
+RUN pip3 install --user -r OCB/requirements.txt
+RUN pip3 install --user phonenumbers
 
 # Launch scripts
 COPY ./launch14.sh ./launch.sh
diff --git a/odoo/odoo/shell12.sh b/odoo/odoo/shell12.sh
index 0950da0..c434314 100644
--- a/odoo/odoo/shell12.sh
+++ b/odoo/odoo/shell12.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-python3 OCB/odoo-bin shell -c odoo.conf -d "$@" --no-xmlrpc
+python3 OCB/odoo-bin shell --shell-interface ipython -c odoo.conf -d "$@" --no-xmlrpc