Merge branch 'master' into test

Dockerfile

@@ -44,15 +44,14 @@ RUN apk add --no-cache --virtual .build-deps  \
                 && sed -i '/st_mysql_options options;/a unsigned int reconnect;' /usr/include/mysql/mysql.h \
                 && pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/common.txt \
                 && mkdir -p /tmp/video_convert \
-                && mkdir -p /data/log/gaia/app
+                && mkdir -p /data/log/graces/app
 
-COPY . /srv/apps/gaia/
+COPY . /srv/apps/graces/
 
-WORKDIR /srv/apps/gaia/
+WORKDIR /srv/apps/graces/
 
 # requirements文件中指定安装master分支的依赖每次构建镜像都会重新安装
 RUN cat requirements/common.txt | grep master > /tmp/gm-requirements.txt \
     && pip install --no-deps --upgrade -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/gm-requirements.txt \
     && apk del .build-deps
 
-CMD gunicorn gaia.wsgi:application -w 6 -k gevent -b 0.0.0.0:8000 --worker-tmp-dir /dev/shm