added docker support
extended the server (container) attributes
Merge pull request #2658 from abenari/master

Add docker support