Merge "Modify docker file"