run only on docker interface
Merge branch 'master' of github.com:mikz/dockerfiles

Conflicts:
	postgres/Makefile