Updated and simplified the PG example
Merge branch 'pgdoc' of github.com:jamtur01/docker into 2971-cleanconflicts

Conflicts:
	docs/sources/examples/postgresql_service.rst
Merge branch '2971-cleanconflicts'