Update Dockerfile for new CPU base images#112

sritchie wants to merge 2 commits intomaingoogle/caliban:mainfrom

sritchie/dfilegoogle/caliban:sritchie/dfileCopy head branch name to clipboard