Cleanup Docker Compose files

[eyablokov]

Some docker-compose.yml files are messy:

• restart: commands specified twice for some services;
• wrong indentation in few places.

This pull request fixes that.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}