Merge branch 'master' into testSMS

+############################################################
+# Dockerfile to build tomcat service
+# Based on centos tomcat:8.5.32-jre8-alpine
+# path: /yoho-message-sender/common/ok.jsp
+############################################################
+
+FROM ccr.ccs.tencentyun.com/yoho-base/tomcat:8.5.32-jre8-alpine
+
+MAINTAINER  jimi  <jimi.ji@yoho.cn>
+
+ENV TZ Asia/Shanghai
+
+COPY deploy/target/yoho-message-sender.war /usr/local/tomcat/webapps/yoho-message-sender.war
+
+RUN sed -i 's/<Connector port="8080" protocol/<Connector port="8080" protocol/g' /usr/local/tomcat/conf/server.xml
+	
+WORKDIR /usr/local/tomcat/
+
+#expose port
+EXPOSE 8080