Merge ad83052156 into f8af1a80b1

10.0/Dockerfile

@@ -52,4 +52,4 @@ ENV ODOO_RC /etc/odoo/odoo.conf
 USER odoo
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["odoo"]
+CMD ["odoo-bin"]

10.0/entrypoint.sh

@@ -27,13 +27,13 @@ case "$1" in
     -- | odoo)
         shift
         if [[ "$1" == "scaffold" ]] ; then
-            exec odoo "$@"
+            exec odoo-bin "$@"
         else
-            exec odoo "$@" "${DB_ARGS[@]}"
+            exec odoo-bin "$@" "${DB_ARGS[@]}"
         fi
         ;;
     -*)
-        exec odoo "$@" "${DB_ARGS[@]}"
+        exec odoo-bin "$@" "${DB_ARGS[@]}"
         ;;
     *)
         exec "$@"