Do Docker edits so we can use the new distribution code

Signed-off-by: Doug Davis <dug@us.ibm.com>