Skip to content

S
saturn
Commit 56f6d1c5 authored by 钟尚武's avatar 钟尚武
Browse files
Options

Merge branch 'refactor' into 'master' 

delete app_conf.xml

See merge request !121
parents 2217e128 ba20126d
Pipeline #4844 passed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 13 additions and 61 deletions
    deploy.yaml.temp
    View file @ 56f6d1c5
    ......@@ -45,7 +45,7 @@ spec:
    - command:
    - /bin/bash
    - -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
    image: ccr.ccs.tencentyun.com/gm-ai/like-saturn:<IMAGE_TAG>
    imagePullPolicy: Always
    ......
    deploy/prod/Dockerfile
    View file @ 56f6d1c5
    ......@@ -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
    COPY --from=configs /etc/gm-config /etc/gm-config
    RUN mkdir -p /data/log/sms/app
    COPY ./requirements.txt /srv/apps/sms/
    WORKDIR /srv/apps/sms/
    RUN mkdir -p /data/log/saturn/app
    COPY ./requirements.txt /srv/apps/saturn/
    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/sms/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 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 @ 2217e128
    <?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 @ 56f6d1c5
    ......@@ -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
    COPY --from=configs /etc/gm-config /etc/gm-config
    RUN mkdir -p /data/log/sms/app
    COPY ./requirements.txt /srv/apps/sms/
    WORKDIR /srv/apps/sms/
    RUN mkdir -p /data/log/saturn/app
    COPY ./requirements.txt /srv/apps/saturn/
    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/sms/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 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 @ 2217e128
    <?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 @ 56f6d1c5
    ......@@ -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
    COPY --from=configs /etc/gm-config /etc/gm-config
    RUN mkdir -p /data/log/sms/app
    COPY ./requirements.txt /srv/apps/sms/
    WORKDIR /srv/apps/sms/
    RUN mkdir -p /data/log/saturn/app
    COPY ./requirements.txt /srv/apps/saturn/
    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/sms/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 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 @ 2217e128
    <?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