Finally get Dockerfile correct