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

fix drone

See merge request !408

.drone.yml

+kind: pipeline
+name: like-sun
+
+steps:
+- name: build-test
+  image: plugins/docker
+  when:
+    branch: deploy/like-test
+    instance:
+      exclude:
+        - cicd.iyanzhi.com
+  settings:
+    dockerfile: deploy/test/Dockerfile
+    registry: ccr.ccs.tencentyun.com
+    username: 100009168942
+    password: 3m4V#TMrUTSIebv1
+    repo: ccr.ccs.tencentyun.com/gm-ai/like-sun
+    tags:
+      - ${DRONE_COMMIT}
+
+- name: build-stage
+  image: plugins/docker
+  when:
+    branch: deploy/like-stage
+    instance:
+      exclude:
+        - cicd.gmapp.env
+  settings:
+    dockerfile: deploy/stage/Dockerfile
+    registry: ccr.ccs.tencentyun.com
+    username: 100009168942
+    password: 3m4V#TMrUTSIebv1
+    repo: ccr.ccs.tencentyun.com/gm-ai/like-sun
+    tags:
+      - ${DRONE_COMMIT}
+
+- name: build-prod
+  image: plugins/docker
+  when:
+    branch: deploy/like-prod
+    instance:
+      exclude:
+        - cicd.gmapp.env
+  settings:
+    dockerfile: deploy/prod/Dockerfile
+    registry: ccr.ccs.tencentyun.com
+    dockerfile: deploy/prod/Dockerfile
+    username: 100009168942
+    password: 3m4V#TMrUTSIebv1
+    repo: ccr.ccs.tencentyun.com/gm-ai/like-sun
+    tags:
+      - ${DRONE_COMMIT}
+
+- name: deploy-app
+  image: ccr.ccs.tencentyun.com/gm-ai/drone-kube:pre
+  environment:
+    repo: alpha/sun
+  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-celery
+  image: ccr.ccs.tencentyun.com/gm-ai/drone-kube:pre
+  environment:
+    repo: alpha/sun
+  when:
+    branch:
+      - deploy/like-prod
+      - deploy/like-stage
+    instance:
+      exclude:
+        - cicd.gmapp.env
+  settings:
+    namespace: ${DRONE_BRANCH}
+    template: deploy.celery.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:
+        - cicd.iyanzhi.com
+  environment:
+    repo: alpha/sun
+  settings:
+    namespace: ${DRONE_BRANCH}
+    template: deploy.yaml
+    tag: ${DRONE_COMMIT}
+
+- name: deploy-celery-test
+  image: ccr.ccs.tencentyun.com/gm-ai/drone-kube:test
+  when:
+    branch:
+      - deploy/like-test
+    instance:
+      exclude:
+        - cicd.iyanzhi.com
+  environment:
+    repo: alpha/sun
+  settings:
+    namespace: ${DRONE_BRANCH}
+    template: deploy.celery.yaml
+    tag: ${DRONE_COMMIT}
+
+trigger:
+  branch:
+  - deploy/*
+
+image_pull_secrets:
+  - dockerconfig

deploy.celery.yaml.temp

+# deployment
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: sun-celery
+    release: sun-celery
+  name: sun-celery
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: sun-celery
+      release: sun-celery
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: sun-celery
+        release: sun-celery
+    spec:
+      containers:
+      - args:
+        - worker
+        - -A
+        - api
+        - -c8
+        - --loglevel=INFO
+        - --maxtasksperchild
+        - "500"
+        command:
+        - celery
+        image: ccr.ccs.tencentyun.com/gm-ai/like-sun:<IMAGE_TAG>
+        imagePullPolicy: Always
+        name: sun
+      imagePullSecrets:
+      - name: gm-secret
+      restartPolicy: Always

deploy.yaml.temp

+# service
+apiVersion: v1
+kind: Service
+metadata:
+  name: sun
+spec:
+  ports:
+  - name: tcp-80-80
+    port: 80
+    protocol: TCP
+    targetPort: 80
+  selector:
+    release: sun
+  sessionAffinity: None
+  type: ClusterIP
+
+---
+# deployment
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  labels:
+    app: sun
+    release: sun
+  name: sun
+spec:
+  replicas: 1
+  revisionHistoryLimit: 10
+  selector:
+    matchLabels:
+      app: sun
+      release: sun
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: sun
+        release: sun
+    spec:
+      containers:
+      - command:
+        - /bin/bash
+        - -c
+        - gunicorn sun.wsgi:application --bind=0.0.0.0:80 --workers=8 --worker-class=gevent
+          --worker-connections=1024 --timeout 600
+        image: ccr.ccs.tencentyun.com/gm-ai/like-sun:<IMAGE_TAG>
+        imagePullPolicy: Always
+        name: sun
+        ports:
+        - containerPort: 80
+          name: http
+          protocol: TCP
+      imagePullSecrets:
+      - name: gm-secret
+      restartPolicy: Always

deploy/prod/Dockerfile

+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/sun/app
+COPY ./requirements.txt /srv/apps/sun/
+WORKDIR /srv/apps/sun/
+RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
+
+COPY . .
+ENV PROJECT_ENV=prod
+ENV C_FORCE_ROOT=true
+COPY ./deploy/prod/settings_local.py ./sun/
+CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'

deploy/prod/settings_local.py

+SENTRY_CELERY_ENDPOINT = 'http://c976ba71bc454119a3ba4bfe79495976:944088e9c6fb4a21b2ecb555cc86ebbe@sentry.igengmei.com/137'
+
+DEBUG = False
+
+BROKER_URL = 'redis://:zi1jlhVHtH8MGNqB@172.17.40.145:6379/4'
+CELERY_ACCEPT_CONTENT = ['pickle', 'json']
+CELERY_TASK_SERIALIZER = 'pickle'
+CELERY_RESULT_SERIALIZER = 'pickle'
\ No newline at end of file

deploy/stage/Dockerfile

+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/sun/app
+COPY ./requirements.txt /srv/apps/sun/
+WORKDIR /srv/apps/sun/
+RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
+
+COPY . .
+ENV PROJECT_ENV=stage
+ENV C_FORCE_ROOT=true
+COPY ./deploy/stage/settings_local.py ./sun/
+CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'

deploy/stage/settings_local.py

+SENTRY_CELERY_ENDPOINT = 'http://c976ba71bc454119a3ba4bfe79495976:944088e9c6fb4a21b2ecb555cc86ebbe@sentry.igengmei.com/137'
+
+DEBUG = False
+
+BROKER_URL = 'redis://:zi1jlhVHtH8MGNqB@172.17.40.145:6379/4'
+CELERY_ACCEPT_CONTENT = ['pickle', 'json']
+CELERY_TASK_SERIALIZER = 'pickle'
+CELERY_RESULT_SERIALIZER = 'pickle'
\ No newline at end of file

deploy/test/Dockerfile

+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/sun/app
+COPY ./requirements.txt /srv/apps/sun/
+WORKDIR /srv/apps/sun/
+RUN pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
+
+COPY . .
+ENV PROJECT_ENV=test
+ENV C_FORCE_ROOT=true
+COPY ./deploy/test/settings_local.py ./sun/
+CMD bash -c 'source ~/.bashrc && gunicorn sun.wsgi:application -w 4 -b 0.0.0.0:80 -k gevent'

deploy/test/settings_local.py

+BROKER_URL = 'redis://:Gengmei123@172.21.52.8:6379/2'
+CELERY_BROKER_URL = 'redis://:Gengmei123@172.21.52.8:6379/2'
+CELERY_ACCEPT_CONTENT = ['pickle', 'json']
+CELERY_TASK_SERIALIZER = 'pickle'
+CELERY_RESULT_SERIALIZER = 'pickle'
\ No newline at end of file