edit

src/docker/build/office/convert/Dockerfile

@@ -13,10 +13,13 @@ RUN apk add --no-cache --update git curl nginx gcc g++ python-dev py-pip make cm
 	pip install wand && \
 	pip install -U git+http://git.dever.cc:3000/python/demeter.git && \
 	git clone http://git.dever.cc:3000/python/convert.git $DEMETER_HOME && \
+	rm -rf $DEMETER_HOME/runtime/mysql/* && \
 	curl -O https://fossies.org/linux/misc/poppler-data-0.4.9.tar.gz && \
 	tar -zxvf poppler-data-0.4.9.tar.gz && \
 	cd poppler-data-0.4.9 && \
 	make install datadir=/usr/share && \
+	mkdir /run/nginx/ && \
+	rm -rf /etc/nginx/conf.d/default.conf && \
 	apk del curl make cmake gcc g++ python-dev
 
 EXPOSE 8087 8088 80 443

src/docker/build/office/convert/convert.sh

@@ -3,12 +3,12 @@ set -e
 
 start_convert()
 {
-    mysqladmin -hoffice_mysql -uroot -p create office_convert
+    mysqladmin -hoffice-mysql -uroot -p123456 create office_convert
+    pip install -U git+http://git.dever.cc:3000/python/demeter.git
     cd $DEMETER_HOME
-    git reset --hard FETCH_HEAD
     git pull
     chmod -R +x $DEMETER_HOME/*.py
-    install.py
+    python install.py
     process_start nginx
     process_start admin.py
     process_start front.py

src/docker/build/tool/vsftpd/Dockerfile

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

src/docker/conf/tool.conf

@@ -37,4 +37,12 @@ volumes = {container}share/sync_server:/data
 [file_worker]
 image = btsync
 command = {$input:A4IDCT5EADNLSWEZ3V5C3ONPGBBGEUDJD}
-volumes = {container}share/sync_client:/data
+volumes = {container}share/sync_client:/data
+
+
+;ftp
+[ftp]
+image = vsftpd
+port = 20:20,21:21,21100-21110:21100-21110
+volumes = {container}web/files:/home/vsftpd
+environment = FTP_USER=ftpadmin,FTP_PASS=123456

src/docker/core.conf

@@ -76,6 +76,7 @@ apidoc				= tool/apidoc
 jupyter				= tool/jupyter
 grafana				= tool/grafana
 pan					= tool/pan
+vsftpd				= tool/vsftpd
 
 ;learn
 learn				= learning