Merge branch 'master' of ssh://git.dever.cc:10022/python/dm

src/docker/build/tool/vsftpd/Dockerfile

@@ -1,3 +0,0 @@
-FROM fauria/vsftpd
-
-MAINTAINER Rabin "https://github.com/shemic"

src/docker/conf/web.conf

@@ -12,7 +12,7 @@ alias = mysql
 #使用mariadb来代替mysql
 image = mariadb
 #port = 3310:3306
-volumes = {container}conf/db/mariadb:/etc/mysql,/data/mysql/{name}/data:/var/lib/mysql
+volumes = {container}conf/db/mariadb:/etc/mysql,/data/mariadb/{name}/data:/var/lib/mysql
 environment = MYSQL_ROOT_PASSWORD=123456
 alias = mysql