Merge branch 'master' into test

Dockerfile

@@ -43,13 +43,13 @@ RUN apk add --no-cache --virtual .build-deps  \
                 && apk add --no-cache  mariadb-connector-c-dev libxml2-dev libxslt-dev librdkafka-dev \
                 && pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
                 && mkdir -p /tmp/video_convert \
-                && mkdir -p /data/log/mimas/app
+                && mkdir -p /data/log/mentha/app
 
-ENV GM_RPCD_DEPLOY_CONF_PATH "/srv/apps/mimas/deploy_prod.xml"
+ENV GM_RPCD_DEPLOY_CONF_PATH "/srv/apps/mentha/deploy_prod.xml"
 
-COPY . /srv/apps/mimas/
+COPY . /srv/apps/mentha/
 
-WORKDIR /srv/apps/mimas/
+WORKDIR /srv/apps/mentha/
 
 RUN cat requirements.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 \