Update Dockerfile for seprating base image.