Consolidate dockerfile commands re #204