Docker support was initially worked on in 2bbb7a5e, but it never really worked.

This extends f7d7434012800c3572049af82a501743d4aed583 which was an old branch for docker work.