Update Dockerfile

reorder for better caching of container commits