Skip to content

Commit 889dccb

Browse files
committed
feat(odoo): unset ODOO_ADDONS_PATH and ADDONS_PATH in docker scripts to avoid conflicts
1 parent 479d17d commit 889dccb

3 files changed

Lines changed: 15 additions & 3 deletions

File tree

roles/odoo/files/docker-odoo-cloc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,8 @@ done
4141

4242
[[ -z "$database" ]] && { echo 'Parameter -d|database is empty.' ; exit 1; }
4343

44-
docker exec -i $container /bin/bash -c "odoo cloc -c /etc/odoo/odoo.conf -d $database --db_host=\$PGHOST --db_user=\$PGUSER --db_password=\$PGPASSWORD --stop-after-init --no-http"
44+
docker exec -i $container /bin/bash -c "
45+
unset ODOO_ADDONS_PATH
46+
unset ADDONS_PATH
47+
odoo cloc -d $database --db_host=\$PGHOST --db_user=\$PGUSER --db_password=\$PGPASSWORD --stop-after-init --no-http
48+
"

roles/odoo/files/docker-odoo-init

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ container_id=$(docker ps -f "name=${container}" -q | head -n1)
5454
[[ -z "$container_id" ]] && { echo "Container id for $container not found." ; exit 1; }
5555

5656
echo "Initializing modules $modules with langague $odoo_language on database $database."
57-
docker exec $container_id /bin/bash -c "odoo -i $modules -d $database --db_host=\$PGHOST --db_user=\$PGUSER --db_password=\$PGPASSWORD $without_demo --load-language $odoo_language --stop-after-init --no-http"
57+
docker exec $container_id /bin/bash -c "
58+
unset ODOO_ADDONS_PATH
59+
unset ADDONS_PATH
60+
odoo -i $modules -d $database --db_host=\$PGHOST --db_user=\$PGUSER --db_password=\$PGPASSWORD $without_demo --load-language $odoo_language --stop-after-init --no-http
61+
"
5862

5963
echo 'Modules initialized. Please restart the Odoo container/process.'

roles/odoo/files/docker-odoo-update

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,8 @@ container_id=$(docker ps -f "name=$container" --format '{{.ID}}' | head -n1)
6161

6262
# Update with Docker exec
6363
echo "Update modules $modules on database $database."
64-
docker exec "$container_id" /bin/bash -c "odoo -c /etc/odoo/odoo.conf -d $database -u $modules --db_host=\$PGHOST --db_user=\$PGUSER --db_password=\$PGPASSWORD --stop-after-init --no-http $overwrite_translations"
64+
docker exec "$container_id" /bin/bash -c "
65+
unset ODOO_ADDONS_PATH
66+
unset ADDONS_PATH
67+
odoo -d $database -u $modules --db_host=\$PGHOST --db_user=\$PGUSER --db_password=\$PGPASSWORD --stop-after-init --no-http $overwrite_translations
68+
"

0 commit comments

Comments
 (0)