Commit progress on Docker rewrite.