Commit a0a19ad9 authored by 钟尚武's avatar 钟尚武

Merge branch 'refactor' into 'master'

fix drone

See merge request !591
parents e9155030 a1dced0f
Pipeline #4995 passed with stage
...@@ -6,6 +6,9 @@ steps: ...@@ -6,6 +6,9 @@ steps:
image: plugins/docker image: plugins/docker
when: when:
branch: deploy/like-test branch: deploy/like-test
instance:
exclude:
- cicd.iyanzhi.com
settings: settings:
dockerfile: deploy/test/Dockerfile dockerfile: deploy/test/Dockerfile
registry: ccr.ccs.tencentyun.com registry: ccr.ccs.tencentyun.com
...@@ -19,6 +22,9 @@ steps: ...@@ -19,6 +22,9 @@ steps:
image: plugins/docker image: plugins/docker
when: when:
branch: deploy/like-stage branch: deploy/like-stage
instance:
exclude:
- cicd.gmapp.env
settings: settings:
dockerfile: deploy/stage/Dockerfile dockerfile: deploy/stage/Dockerfile
registry: ccr.ccs.tencentyun.com registry: ccr.ccs.tencentyun.com
...@@ -32,6 +38,9 @@ steps: ...@@ -32,6 +38,9 @@ steps:
image: plugins/docker image: plugins/docker
when: when:
branch: deploy/like-prod branch: deploy/like-prod
instance:
exclude:
- cicd.gmapp.env
settings: settings:
dockerfile: deploy/prod/Dockerfile dockerfile: deploy/prod/Dockerfile
registry: ccr.ccs.tencentyun.com registry: ccr.ccs.tencentyun.com
...@@ -47,9 +56,27 @@ steps: ...@@ -47,9 +56,27 @@ steps:
environment: environment:
repo: alpha/physical repo: alpha/physical
when: when:
branch:
- deploy/like-prod
- deploy/like-stage
instance:
exclude:
- cicd.gmapp.env
settings:
namespace: ${DRONE_BRANCH}
template: deploy.yaml
tag: ${DRONE_COMMIT}
- name: deploy-app-test
image: ccr.ccs.tencentyun.com/gm-ai/drone-kube:test
when:
branch:
- deploy/like-test
instance: instance:
exclude: exclude:
- aidrone.iyanzhi.com - cicd.iyanzhi.com
environment:
repo: alpha/physical
settings: settings:
namespace: ${DRONE_BRANCH} namespace: ${DRONE_BRANCH}
template: deploy.yaml template: deploy.yaml
......
...@@ -12,5 +12,5 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml" ...@@ -12,5 +12,5 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
ENV PROJECT_ENV=prod ENV PROJECT_ENV=prod
COPY ./deploy/prod/app_conf.xml . COPY ./deploy/prod/app_conf.xml .
COPY ./deploy/prod/settings_local.py ./physical/ COPY ./deploy/prod/settings_local.py ./physical/
CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log' CMD bash -c 'source ~/.bashrc && gunicorn gm_rpcd.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log'
...@@ -12,5 +12,5 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml" ...@@ -12,5 +12,5 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
ENV PROJECT_ENV=stage ENV PROJECT_ENV=stage
COPY ./deploy/stage/app_conf.xml . COPY ./deploy/stage/app_conf.xml .
COPY ./deploy/stage/settings_local.py ./physical/ COPY ./deploy/stage/settings_local.py ./physical/
CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log' CMD bash -c 'source ~/.bashrc && gunicorn gm_rpcd.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log'
...@@ -12,4 +12,4 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml" ...@@ -12,4 +12,4 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
ENV PROJECT_ENV=test ENV PROJECT_ENV=test
COPY ./deploy/test/app_conf.xml . COPY ./deploy/test/app_conf.xml .
COPY ./deploy/test/settings_local.py ./physical/ COPY ./deploy/test/settings_local.py ./physical/
CMD bash -c 'source ~/.bashrc && gunicorn physical.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log' CMD bash -c 'source ~/.bashrc && gunicorn gm_rpcd.wsgi:application --workers=8 --worker-class=gevent --worker-connections=1024 --bind=0.0.0.0:80 --timeout 600 --log-level=debug--error-logfile=/data/log/physical/app/gunicorn_error.log --access-logfile=/data/log/physical/app/gunicorn_access.log'
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