Don't use postgres user
Append resolver port instead of replacing file contents
Revert "Removed dnsmasq"

This reverts commit 1290899b88fcfe100a5f639406ebf7646b2135a5.