Simplified the Dockerfile a bit