Updated Dockerfile to reduce build commands