The Odoo 10 base image now merges addons, same as the Odoo 11 one.

also changed tabs to spaces

needed to avoid using flake8 for python 2 in odoo 11.0+

 use correct configuration file in odoo 11 or 12 when binding to local configuration file

thanks to atexit, postgresql stops correctly at exit