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

fix drone

See merge request !592

.drone.yml

@@ -6,6 +6,9 @@ steps:
   image: plugins/docker
   when:
     branch: deploy/like-test
+    instance:
+      exclude:
+        - cicd.iyanzhi.com
   settings:
     dockerfile: deploy/test/Dockerfile
     registry: ccr.ccs.tencentyun.com
@@ -19,6 +22,9 @@ steps:
   image: plugins/docker
   when:
     branch: deploy/like-stage
+    instance:
+      exclude:
+        - cicd.gmapp.env
   settings:
     dockerfile: deploy/stage/Dockerfile
     registry: ccr.ccs.tencentyun.com
@@ -32,6 +38,9 @@ steps:
   image: plugins/docker
   when:
     branch: deploy/like-prod
+    instance:
+      exclude:
+        - cicd.gmapp.env
   settings:
     dockerfile: deploy/prod/Dockerfile
     registry: ccr.ccs.tencentyun.com
@@ -47,9 +56,27 @@ steps:
   environment:
     repo: alpha/physical
   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:
       exclude:
-        - aidrone.iyanzhi.com
+        - cicd.iyanzhi.com
+  environment:
+    repo: alpha/physical
   settings:
     namespace: ${DRONE_BRANCH}
     template: deploy.yaml

deploy/prod/Dockerfile

@@ -12,5 +12,5 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
 ENV PROJECT_ENV=prod
 COPY ./deploy/prod/app_conf.xml .
 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'
 

deploy/stage/Dockerfile

@@ -12,5 +12,5 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
 ENV PROJECT_ENV=stage
 COPY ./deploy/stage/app_conf.xml .
 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'
 

deploy/test/Dockerfile

@@ -12,4 +12,4 @@ ENV GM_RPCD_DEPLOY_CONF_PATH="/srv/apps/physical/app_conf.xml"
 ENV PROJECT_ENV=test
 COPY ./deploy/test/app_conf.xml .
 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'