Skip to content

S
saturn
Commit ba20126d authored by zhongshangwu's avatar zhongshangwu
Browse files
Options

delete app_conf.xml

parent f65d61a7
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 61 deletions
deploy.yaml.temp
View file @ ba20126d
...@@ -45,7 +45,7 @@ spec: ...@@ -45,7 +45,7 @@ spec:
- command: - command:
- /bin/bash - /bin/bash
- -c - -c
- gunicorn gm_rpcd.wsgi:application --bind=0.0.0.0:80 --workers=16 --worker-class=gevent - gunicorn saturn.wsgi:application --bind=0.0.0.0:80 --workers=16 --worker-class=gevent
--worker-connections=1024 --timeout 600 --worker-connections=1024 --timeout 600
image: ccr.ccs.tencentyun.com/gm-ai/like-saturn:<IMAGE_TAG> image: ccr.ccs.tencentyun.com/gm-ai/like-saturn:<IMAGE_TAG>
imagePullPolicy: Always imagePullPolicy: Always
......
deploy/prod/Dockerfile
View file @ ba20126d
...@@ -2,14 +2,12 @@ FROM ccr.ccs.tencentyun.com/gm-ai/like-configs:prod as configs ...@@ -2,14 +2,12 @@ FROM ccr.ccs.tencentyun.com/gm-ai/like-configs:prod as configs
FROM ccr.ccs.tencentyun.com/gm-ai/alpha-python:3.6 FROM ccr.ccs.tencentyun.com/gm-ai/alpha-python:3.6
COPY --from=configs /etc/gm-config /etc/gm-config COPY --from=configs /etc/gm-config /etc/gm-config
RUN mkdir -p /data/log/sms/app RUN mkdir -p /data/log/saturn/app
COPY ./requirements.txt /srv/apps/sms/ COPY ./requirements.txt /srv/apps/saturn/
WORKDIR /srv/apps/sms/ WORKDIR /srv/apps/saturn/
RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
COPY . . COPY . .
ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/sms/app_conf.xml"
ENV PROJECT_ENV=prod ENV PROJECT_ENV=prod
COPY ./deploy/prod/app_conf.xml .
COPY ./deploy/prod/settings_local.py ./settings/ COPY ./deploy/prod/settings_local.py ./settings/
CMD bash -c 'source ~/.bashrc && gunicorn gm_rpcd.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent' CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent'
deploy/prod/app_conf.xml deleted 100644 → 0
View file @ f65d61a7
<?xml version="1.0" encoding="utf-8"?>
<gm_rpcd_config>
<info config_name="app" version="1.0"/>
<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="log_dir" value="/data/log/saturn/app"/>
<config name="initializer_list">
<element value="saturn.django_init"/>
</config>
</gm_rpcd_config>
\ No newline at end of file
deploy/stage/Dockerfile
View file @ ba20126d
...@@ -2,14 +2,12 @@ FROM ccr.ccs.tencentyun.com/gm-ai/like-configs:stage as configs ...@@ -2,14 +2,12 @@ FROM ccr.ccs.tencentyun.com/gm-ai/like-configs:stage as configs
FROM ccr.ccs.tencentyun.com/gm-ai/alpha-python:3.6 FROM ccr.ccs.tencentyun.com/gm-ai/alpha-python:3.6
COPY --from=configs /etc/gm-config /etc/gm-config COPY --from=configs /etc/gm-config /etc/gm-config
RUN mkdir -p /data/log/sms/app RUN mkdir -p /data/log/saturn/app
COPY ./requirements.txt /srv/apps/sms/ COPY ./requirements.txt /srv/apps/saturn/
WORKDIR /srv/apps/sms/ WORKDIR /srv/apps/saturn/
RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
COPY . . COPY . .
ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/sms/app_conf.xml"
ENV PROJECT_ENV=stage ENV PROJECT_ENV=stage
COPY ./deploy/stage/app_conf.xml .
COPY ./deploy/stage/settings_local.py ./settings/ COPY ./deploy/stage/settings_local.py ./settings/
CMD bash -c 'source ~/.bashrc && gunicorn gm_rpcd.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent' CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent'
deploy/stage/app_conf.xml deleted 100644 → 0
View file @ f65d61a7
<?xml version="1.0" encoding="utf-8"?>
<gm_rpcd_config>
<info config_name="app" version="1.0"/>
<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>
<config name="log_dir" value="/data/log/saturn/app"/>
</gm_rpcd_config>
\ No newline at end of file
deploy/test/Dockerfile
View file @ ba20126d
...@@ -2,14 +2,12 @@ FROM ccr.ccs.tencentyun.com/gm-ai/like-configs:test as configs ...@@ -2,14 +2,12 @@ FROM ccr.ccs.tencentyun.com/gm-ai/like-configs:test as configs
FROM ccr.ccs.tencentyun.com/gm-ai/alpha-python:3.6 FROM ccr.ccs.tencentyun.com/gm-ai/alpha-python:3.6
COPY --from=configs /etc/gm-config /etc/gm-config COPY --from=configs /etc/gm-config /etc/gm-config
RUN mkdir -p /data/log/sms/app RUN mkdir -p /data/log/saturn/app
COPY ./requirements.txt /srv/apps/sms/ COPY ./requirements.txt /srv/apps/saturn/
WORKDIR /srv/apps/sms/ WORKDIR /srv/apps/saturn/
RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
COPY . . COPY . .
ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/sms/app_conf.xml"
ENV PROJECT_ENV=test ENV PROJECT_ENV=test
COPY ./deploy/test/app_conf.xml .
COPY ./deploy/test/settings_local.py ./settings/ COPY ./deploy/test/settings_local.py ./settings/
CMD bash -c 'source ~/.bashrc && gunicorn gm_rpcd.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent' CMD bash -c 'source ~/.bashrc && gunicorn saturn.wsgi:application -w 16 -b 0.0.0.0:80 -k gevent'
deploy/test/app_conf.xml deleted 100644 → 0
View file @ f65d61a7
<?xml version="1.0" encoding="utf-8"?>
<gm_rpcd_config>
<info config_name="app" version="1.0"/>
<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>
<config name="log_dir" value="/data/log/saturn/app"/>
</gm_rpcd_config>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment