Trimming this Dockerfile down