Updated Dockerfile, with less layers