update zabbix cmt
conflict resolved
Merge branch 'master' of https://github.com/trungtan/docker_base
update gogs ssh