More progress on Docker dev post #11