Merge branch 'master' into 'deploy/like-stage'

fix

See merge request !124

deploy/prod/Dockerfile

@@ -8,6 +8,8 @@ WORKDIR /srv/apps/saturn/
 RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
 
 COPY . .
+ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/saturn/app_conf.xml"
 ENV PROJECT_ENV=prod
+COPY ./deploy/prod/app_conf.xml .
 COPY ./deploy/prod/settings_local.py ./settings/
-CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent'
+CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'

deploy/prod/app_conf.xml

+<?xml version="1.0" encoding="utf-8"?>
+<gm_rpcd_config>
+    <info config_name="app" version="1.0"/>
+    <config name="log_dir" value="/data/log/saturn/app"/>
+    <config name="sentry_dsn" value="http://39f1236352c04a80826878f459ef1b05:333fbf94113c4879addaf656f233eb8e@sentry.igengmei.com/138"/>
+    <config name="application_name" value="saturn"/>
+    <config name="service_list">
+        <element value="saturn"/>
+    </config>
+    <config name="initializer_list">
+        <element value="saturn.django_init"/>
+    </config>
+</gm_rpcd_config>
+~
\ No newline at end of file

deploy/stage/Dockerfile

@@ -8,6 +8,8 @@ WORKDIR /srv/apps/saturn/
 RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
 
 COPY . .
+ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/saturn/app_conf.xml"
 ENV PROJECT_ENV=stage
+COPY ./deploy/stage/app_conf.xml .
 COPY ./deploy/stage/settings_local.py ./settings/
-CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent'
+CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'

deploy/stage/app_conf.xml

+<?xml version="1.0" encoding="utf-8"?>
+<gm_rpcd_config>
+    <info config_name="app" version="1.0"/>
+    <config name="log_dir" value="/data/log/saturn/app"/>
+    <config name="sentry_dsn" value="http://39f1236352c04a80826878f459ef1b05:333fbf94113c4879addaf656f233eb8e@sentry.igengmei.com/138"/>
+    <config name="application_name" value="saturn"/>
+    <config name="service_list">
+        <element value="saturn"/>
+    </config>
+    <config name="initializer_list">
+        <element value="saturn.django_init"/>
+    </config>
+</gm_rpcd_config>
+~
\ No newline at end of file

deploy/test/Dockerfile

@@ -8,6 +8,8 @@ WORKDIR /srv/apps/saturn/
 RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
 
 COPY . .
+ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/saturn/app_conf.xml"
 ENV PROJECT_ENV=test
+COPY ./deploy/test/app_conf.xml .
 COPY ./deploy/test/settings_local.py ./settings/
-CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent'
+CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'

deploy/test/app_conf.xml

+<?xml version="1.0" encoding="utf-8"?>
+<gm_rpcd_config>
+    <info config_name="app" version="1.0"/>
+    <config name="log_dir" value="/data/log/saturn/app"/>
+    <config name="sentry_dsn" value="http://39f1236352c04a80826878f459ef1b05:333fbf94113c4879addaf656f233eb8e@sentry.igengmei.com/138"/>
+    <config name="application_name" value="saturn"/>
+    <config name="service_list">
+        <element value="saturn"/>
+    </config>
+    <config name="initializer_list">
+        <element value="saturn.django_init"/>
+    </config>
+</gm_rpcd_config>
\ No newline at end of file