Updated and cleaned Dockerfile