Hardcode volume support, lots of cleanups in common/docker