edit README

Author: yangmv

Dockerfile

@@ -7,27 +7,33 @@ ENV TZ=Asia/Shanghai
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # 1. 安装基本依赖
-RUN yum update -y && yum install epel-release -y && yum update -y && yum install wget unzip epel-release nginx  xz gcc automake zlib-devel openssl-devel supervisor  groupinstall development  libxslt-devel libxml2-devel libcurl-devel git -y
+RUN yum update -y && yum install epel-release -y && yum update -y && yum install wget unzip epel-release nginx  xz gcc automake zlib-devel openssl-devel supervisor  net-tools groupinstall development  libxslt-devel libxml2-devel libcurl-devel git -y
 
 # 2. 准备python
-RUN wget https://www.python.org/ftp/python/3.7.1/Python-3.7.1.tar.xz
-RUN xz -d Python-3.7.1.tar.xz && tar xvf Python-3.7.1.tar && cd Python-3.7.1 && ./configure && make && make install
+RUN wget https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz
+RUN xz -d Python-3.6.6.tar.xz && tar xvf Python-3.6.6.tar && cd Python-3.6.6 && ./configure && make && make install
 
 # 3. 复制代码
 RUN mkdir -p /var/www/
 ADD . /var/www/CMDB/
 
 # 4. 安装pip依赖
-RUN pip3 install --upgrade pip
-RUN pip3 install -r /var/www/CMDB/requirements.txt
+RUN pip3 install --user --upgrade pip
+RUN pip3 install -r /var/www/SuperCMDB/requirements.txt
 
 # 5. 数据初始化
-RUN python3 manage.py makemigrations
-RUN python3 manage.py migrate
+RUN python3 /var/www/SuperCMDB/manage.py makemigrations
+RUN python3 /var/www/SuperCMDB/manage.py migrate
 
-# 5. 准备文件
-COPY doc/supervisor_cmdb.conf  /etc/supervisord.conf
-COPY doc/nginx_cmdb.conf /etc/nginx/conf.d/
+# 6. 日志
+VOLUME /var/log/
+
+# 7. 准备文件
+COPY docs/supervisor_cmdb.conf  /etc/supervisord.conf
+COPY docs/nginx_cmdb.conf /etc/nginx/conf.d/
 
 EXPOSE 80
-CMD ["/usr/bin/supervisord"]
+CMD ["/usr/bin/supervisord"]
+
+##### build测试
+# docker build -t cmdb .

README.md

@@ -34,15 +34,18 @@ python3 manage.py migrate
 ```
 cat >> /etc/supervisord.conf <<EOF
 [program:cmdb]
-process_name=cmdb
-command=python3 run_server.py
-directory=/var/www/CMDB
+command=python3 startup.py --port=80%(process_num)02d
+process_name=%(program_name)s_%(process_num)02d
+numprocs=3
+directory=/var/www/SuperCMDB
 user=root
+autostart=true
 autorestart=true
 redirect_stderr=true
-stdout_logfile=/var/log/cmdb.log
+stdout_logfile=/var/log/supervisor/cmdb.log
 loglevel=info
 logfile_maxbytes=100MB
+logfile_backups=3
 EOF
 
 supervisorctl update
@@ -52,7 +55,13 @@ supervisorctl reload
 #### 五 Nginx配置
 ```
 upstream  cmdb{
-        server  127.0.0.1:8000;
+    server  127.0.0.1:9000;
+    server  127.0.0.1:9001;
+    server  127.0.0.1:9002;
+}
+
+location /static {
+        alias /var/www/CMDB/static;
 }
 
 location /api/cmdb/ {

apps/ws/__pycache__/handler.cpython-37.pyc

@@ -164,7 +164,7 @@ async def get(self, *args, **kwargs):
 
 ws_urls = [
     ('/ws/test', WsTest),
-    ('/ws/terminal', WebTerminalHandler)
+    ('/v1/cmdb/ws/terminal', WebTerminalHandler)
 ]
 
 

apps/ws/handler.py

@@ -1,9 +1,13 @@
-auto_cmdb:
+cmdb:
   restart: unless-stopped
   image: cmdb_image
   volumes:
     - /var/log/supervisor/:/var/log/supervisor/
     - /sys/fs/cgroup:/sys/fs/cgroup
   ports:
-    - "8000:80"
-  hostname: cmdb-exec01
+    - "8002:80"
+  hostname: cmdb-exec01
+
+  # docker-compose up -d
+  # docker-compose down
+  # 接口测试: http://k8s.yangmv.com:8001/v1/k8s/publish/

docker-compose.yml

@@ -1,5 +1,7 @@
 upstream  cmdb{
     server  127.0.0.1:8000;
+    server  127.0.0.1:8001;
+    server  127.0.0.1:8002;
 }
 
 server
@@ -19,12 +21,9 @@ server
             rewrite (.*) /static/favicon.ico;
         }
 
-        location ^~ /static/ {
-                    alias /var/www/CMDB/static/;
-                    if ($query_string) {
-                        expires max;
-                    }
-                }
+        #location /static {
+        #        alias /var/www/CMDB/static;
+        #}
 
         location /api/cmdb/ {
                 proxy_set_header Host $http_host;

docs/nginx_cmdb.conf

@@ -2,15 +2,18 @@
 nodaemon=true
 
 [program:cmdb]
-process_name=cmdb
-command=python3 run_server.py
-directory=/var/www/CMDB
+command=python3 startup.py --port=90%(process_num)02d
+process_name=%(program_name)s_%(process_num)02d
+numprocs=3
+directory=/var/www/SuperCMDB
 user=root
+autostart=true
 autorestart=true
 redirect_stderr=true
-stdout_logfile=/var/log/cmdb.log
+stdout_logfile=/var/log/supervisor/cmdb.log
 loglevel=info
 logfile_maxbytes=100MB
+logfile_backups=3
 
 [program:nginx]
 command=/usr/sbin/nginx -g "daemon off;"

docs/supervisor_cmdb.conf

@@ -60,10 +60,10 @@ def getObj(self,filename):
 if __name__ == '__main__':
     oss_config = {
         "STORAGE_REGION":"cn-shanghai",
-        "STORAGE_NAME":"shinezone-opendevops",
+        "STORAGE_NAME":"xx",
         "STORAGE_PATH":"record",
-        "STORAGE_KEY_ID":"LTAIRiWZ3L2W7NQc",
-        "STORAGE_KEY_SECRET":"vjUr6a6YcWlUqKO8WEJFLdINCdG42e"
+        "STORAGE_KEY_ID":"",
+        "STORAGE_KEY_SECRET":""
     }
 
     data = '{"name":"yangmv","age":18}'

libs/Aliyun/oss.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+#encoding:utf-8
+'''
+@author: yangmv
+@file: run_server.py
+@time: 18/11/26上午9:44
+'''
+import tornado.web
+import tornado.wsgi
+import os
+from apps.ws.handler import ws_urls
+from ops.settings import DEBUG
+from libs.tornado_libs.application import Application as myapplication
+from django.core.wsgi import get_wsgi_application
+os.environ['DJANGO_SETTINGS_MODULE'] = 'ops.settings'
+
+class Application(myapplication):
+    def __init__(self,**settings):
+        wsgi_app = get_wsgi_application()
+        container = tornado.wsgi.WSGIContainer(wsgi_app)
+        urls = []
+        urls.extend(ws_urls)
+        urls.extend([
+            ("/static/(.*)", tornado.web.StaticFileHandler,dict(path=os.path.join(os.path.dirname(__file__), "static"))),
+            ('.*', tornado.web.FallbackHandler, dict(fallback=container))
+        ])
+        super(Application,self).__init__(urls,**settings)
+
+def main():
+    settings = {
+        'debug' : DEBUG
+    }
+    app = Application(**settings)
+    app.start_server()
+
+if __name__ == '__main__':
+    main()