rejig order of Dockerfile