This helps clean up the container file and move volumes into one location. We currently cannot move volumes to a sub pkg because they depend on Container and also modify fields on the container. Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: bd54d40f68f78093d6a252e96f8d17f7021af7b5 Component: engine