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

container/conf/web/php5/php.ini

@@ -657,7 +657,7 @@ auto_globals_jit = On
 ; Its value may be 0 to disable the limit. It is ignored if POST data reading
 ; is disabled through enable_post_data_reading.
 ; http://php.net/post-max-size
-post_max_size = 8M
+post_max_size = 80M
 
 ; Automatically add files before PHP document.
 ; http://php.net/auto-prepend-file

container/conf/web/php7/php.ini

@@ -668,7 +668,7 @@ auto_globals_jit = On
 ; Its value may be 0 to disable the limit. It is ignored if POST data reading
 ; is disabled through enable_post_data_reading.
 ; http://php.net/post-max-size
-post_max_size = 8M
+post_max_size = 80M
 
 ; Automatically add files before PHP document.
 ; http://php.net/auto-prepend-file
@@ -822,7 +822,7 @@ file_uploads = On
 
 ; Maximum allowed size for uploaded files.
 ; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
+upload_max_filesize = 20M
 
 ; Maximum number of files that can be uploaded via a single request
 max_file_uploads = 20

src/docker/build/tool/pan/Dockerfile

@@ -1,3 +1,5 @@
 FROM jaegerdocker/pan
 
-MAINTAINER Rabin "https://github.com/shemic"
+MAINTAINER Rabin "https://github.com/shemic"
+
+RUN chown -R mysql /var/lib/mysql && chgrp -R mysql /var/lib/mysql

src/docker/conf/office.conf

@@ -7,10 +7,17 @@ volumes = {container}conf/db/mariadb:/etc/mysql,/data/convert_mysql/{name}/data:
 environment = MYSQL_ROOT_PASSWORD=123456
 
 [redis]
-#port = 6379:6379
+port = 6379:6379
 volumes = {container}conf/db/redis/redis.conf:/etc/redis.conf
 
 [convert]
 port = 80:80,8087:8087,8088:8088
-volumes = {container}web:/www,{container}web/convert/static:/usr/local/convert/front/static,{container}web/convert/files:/usr/local/convert/runtime/upload
-command = convert
+volumes = {container}web:/www,{container}web/convert/static:/usr/local/convert/front/static,{container}web/convert/files:/usr/local/convert/runtime/files
+command = convert
+
+#使用dm call office-convert_call id=1来运行，id为要转换的文件id
+[convert_call]
+image = convert
+volumes = {container}web:/www,{container}web/convert/static:/usr/local/convert/front/static,{container}web/convert/files:/usr/local/convert/runtime/files
+call = python
+param = /usr/local/convert/convert.py -f {$id:1}

src/docker/conf/web.conf

@@ -1,6 +1,6 @@
 [base]
 path = {base}
-default = mariadb,php7,nginx
+default = mysql,php7,nginx
 
 [#mysql]
 #port = 3309:3306