Update the Dockerfile to resolve merge conflicts

Also use a copy-paste friendly command-line snipet in the README.