Made Dockerfile more generic