Merge "调整dockerfile,方便部署"