resync Dockerfile with my docker.io Dockerfile for great caching