Docker role

Fixes #1207
Depends on #1238
Ouch, that was a mistake.  I'll revert it.