More tweaks to Dockerfiles.  Still WIP.