Improved Dockerfile.