From a39d59e119a987f2f4c8cb17160080e5bf2b3566 Mon Sep 17 00:00:00 2001
From: Yann Autissier <yann.autissier@gmail.com>
Date: Thu, 10 Mar 2022 22:21:36 +0000
Subject: [PATCH] fix odoo setup

---
 docker/docker-compose.local.yml             |  6 ----
 docker/docker-compose.yml                   |  7 ++--
 docker/odoo14/docker-entrypoint.sh          | 39 ++++++++++++---------
 librezo-addons/base_librezo/__manifest__.py |  2 --
 migration.yml                               |  6 +++-
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml
index 74c1bbe..b110d90 100644
--- a/docker/docker-compose.local.yml
+++ b/docker/docker-compose.local.yml
@@ -2,12 +2,6 @@ version: "3.6"
 
 services:
   odoo14:
-    environment:
-      ADDITIONAL_ODOO_RC: |-
-        encryption_key=local.localhost
-        [ir.config_parameter]
-        report.url=http://odoo.local.localhost
-        web.base.url=http://odoo.local.localhost
     depends_on:
       - kwkhtmltopdf
   kwkhtmltopdf:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 686f340..801a262 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,7 +18,6 @@ services:
       target: ${DOCKER_BUILD_TARGET}
     environment:
       - ADDITIONAL_ODOO_RC=${ODOO14_ADDITIONAL_ODOO_RC}
-      - ADDONS_PATH=${ODOO14_ADDONS_PATH:-\$ADDONS_PATH}
       - ADMIN_PASSWD=${ODOO14_ADMIN_PASSWD}
       - DB_HOST=${ODOO14_DB_HOST}
       - DB_NAME=${ODOO14_DB_NAME}
@@ -30,12 +29,12 @@ services:
       - MARABUNTA_ALLOW_SERIE=${ODOO14_MARABUNTA_ALLOW_SERIE:-True}
       - MARABUNTA_FORCE_VERSION=${ODOO14_MARABUNTA_FORCE_VERSION}
       - MARABUNTA_MODE=${ODOO14_MARABUNTA_MODE:-demo}
-      - MAX_CRON_THREADS=${ODOO14_MAX_CRON_THREADS}
+      - MAX_CRON_THREADS=${ODOO14_MAX_CRON_THREADS:-2}
       - ODOO_BASE_URL=${ODOO14_ODOO_BASE_URL}
-      - ODOO_QUEUE_JOB_CHANNELS=${ODOO14_ODOO_QUEUE_JOB_CHANNELS}
+      - ODOO_QUEUE_JOB_CHANNELS=${ODOO14_ODOO_QUEUE_JOB_CHANNELS:-root:1}
       - ODOO_REPORT_URL=${ODOO14_ODOO_REPORT_URL}
       - RUNNING_ENV=${ODOO14_RUNNING_ENV:-dev}
-      - SERVER_WIDE_MODULES=${ODOO14_SERVER_WIDE_MODULES}
+      - SERVER_WIDE_MODULES=${ODOO14_SERVER_WIDE_MODULES:-web}
       - WORKERS=${ODOO14_WORKERS:-0}
     networks:
       private:
diff --git a/docker/odoo14/docker-entrypoint.sh b/docker/odoo14/docker-entrypoint.sh
index fc135ba..9fedf6f 100644
--- a/docker/odoo14/docker-entrypoint.sh
+++ b/docker/odoo14/docker-entrypoint.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
-set -eu
+set -e
 
 mkdir -p /opt/odoo/etc
 envsubst < /opt/odoo/odoo.conf.tpl > /opt/odoo/etc/odoo.conf
 
-export PGHOST=${DB_HOST}
-export PGPORT=${DB_PORT:-5432}
-export PGUSER=${DB_USER}
-export PGPASSWORD=${DB_PASSWORD}
-export PGDATABASE=${DB_NAME}
+export PGHOST="${DB_HOST:-db}"
+export PGPORT="${DB_PORT:-5432}"
+export PGUSER="${DB_USER:-odoo}"
+export PGPASSWORD="${DB_PASSWORD:-odoo}"
+export PGDATABASE="${DB_NAME:-odoo}"
 
 mkdir -p /data/odoo/{addons,filestore,sessions}
 if [ ! "$(stat -c '%U' /data/odoo)" = "odoo" ]; then
@@ -18,33 +18,38 @@ fi
 BASE_CMD=$(basename $1)
 if [ "$BASE_CMD" = "odoo" ] || [ "$BASE_CMD" = "odoo.py" ] || [ "$BASE_CMD" = "odoo-bin" ] || [ "$BASE_CMD" = "openerp-server" ] ; then
 
+  # wait db
+  while ! psql -l -h "$DB_HOST" -U "$DB_USER" >/dev/null 2>&1; do
+    count="$(( ${count:-0}+1 ))"
+    [ "${count}" -eq "${DB_WAIT:-24}" ] && echo "Unable to connect to db host: $DB_HOST" && exit 1
+    sleep 1
+  done
+
   # create db
-  if ! psql -lqtA -h $DB_HOST -U $DB_USER | grep -q "^$DB_NAME|"; then
-      createdb -h $DB_HOST -U $DB_USER -O $DB_USER $DB_NAME
+  if ! psql -lqtA -h "$DB_HOST" -U "$DB_USER" | grep -q "^$DB_NAME|"; then
+      createdb -h "$DB_HOST" -U "$DB_USER" -O "$DB_USER" "$DB_NAME"
   fi
 
   # update db
-  MARABUNTA_DB_HOST=$DB_HOST \
-   MARABUNTA_DATABASE=$DB_NAME \
-   MARABUNTA_DB_USER=$DB_USER \
-   MARABUNTA_DB_PASSWORD=$DB_PASSWORD \
-   MARABUNTA_DB_PORT=$DB_PORT \
+  MARABUNTA_DB_HOST="$DB_HOST" \
+   MARABUNTA_DATABASE="$DB_NAME" \
+   MARABUNTA_DB_USER="$DB_USER" \
+   MARABUNTA_DB_PASSWORD="$DB_PASSWORD" \
+   MARABUNTA_DB_PORT="$DB_PORT" \
    unbuffer marabunta --migration-file /opt/odoo/migration.yml
 
   ENTRYPOINT_DIR=/opt/odoo/entrypoint.d
   if [ -d "$ENTRYPOINT_DIR" ]; then
     if [ -z "${NOGOSU:-}" ] ; then
-      gosu odoo run-parts --verbose "$ENTRYPOINT_DIR"
+      gosu odoo run-parts "$ENTRYPOINT_DIR"
     else
-      run-parts --verbose "$ENTRYPOINT_DIR"
+      run-parts "$ENTRYPOINT_DIR"
     fi
   fi
 fi
 
 if [ -z "${NOGOSU:-}" ] ; then
-  echo "Running $@ with UID $USER_ID"
   exec gosu odoo "$@"
 else
-  echo "Running $@"
   exec "$@"
 fi
diff --git a/librezo-addons/base_librezo/__manifest__.py b/librezo-addons/base_librezo/__manifest__.py
index 931a12b..14f5b08 100644
--- a/librezo-addons/base_librezo/__manifest__.py
+++ b/librezo-addons/base_librezo/__manifest__.py
@@ -9,9 +9,7 @@
     "depends": [
         "base",
         "l10n_fr",
-        "account_financial_report",
         "contacts",
-        "products",
         "sale",
         "server_environment_ir_config_parameter",
         "server_environment_data_encryption",
diff --git a/migration.yml b/migration.yml
index 1fafdda..0dc8241 100644
--- a/migration.yml
+++ b/migration.yml
@@ -1,8 +1,12 @@
 migration:
   options:
-    install_command: odoo --without-demo=${WITHOUT_DEMO:-True} -d odoo14 -i web,base_librezo --stop-after-init
+    install_command: odoo --without-demo=${WITHOUT_DEMO:-True}
   versions:
     - version: setup
       operations:
         pre:
           - 'sh -c ''psql -c "CREATE EXTENSION pg_trgm;"'''
+      addons:
+        upgrade:
+          - base_librezo
+          - web