Fixes for Docker source plugin

Sam Thursfieldrequested to merge
sam/docker-source into master

This fixes some issues I encountered when using the plugin.

Merge request reports