Update to Dockerfile 2