edit

Author: yangmv

Dockerfile

@@ -7,7 +7,7 @@ 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  net-tools 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 mariadb-devel groupinstall development  libxslt-devel libxml2-devel libcurl-devel git -y
 
 # 2. 准备python
 RUN wget https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz
@@ -19,11 +19,11 @@ ADD . /var/www/CMDB/
 
 # 4. 安装pip依赖
 RUN pip3 install --user --upgrade pip
-RUN pip3 install -r /var/www/SuperCMDB/requirements.txt
+RUN pip3 install -r /var/www/CMDB/requirements.txt
 
 # 5. 数据初始化
-RUN python3 /var/www/SuperCMDB/manage.py makemigrations
-RUN python3 /var/www/SuperCMDB/manage.py migrate
+RUN python3 /var/www/CMDB/manage.py makemigrations
+RUN python3 /var/www/CMDB/manage.py migrate
 
 # 6. 日志
 VOLUME /var/log/

README.md

@@ -26,6 +26,7 @@ pip3 install -r requirements.txt
 
 #### 三 同步数据库
 ```
+mysql -h 127.0.0.1 -u root -p123456 -e "create database cmdb default character set utf8mb4 collate utf8mb4_unicode_ci;"
 python3 manage.py makemigrations
 python3 manage.py migrate
 ```
@@ -37,7 +38,7 @@ cat >> /etc/supervisord.conf <<EOF
 command=python3 startup.py --port=80%(process_num)02d
 process_name=%(program_name)s_%(process_num)02d
 numprocs=3
-directory=/var/www/SuperCMDB
+directory=/var/www/CMDB
 user=root
 autostart=true
 autorestart=true

docker-compose.yml

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

docs/nginx_cmdb.conf

@@ -1,13 +1,13 @@
 upstream  cmdb{
-    server  127.0.0.1:8000;
-    server  127.0.0.1:8001;
-    server  127.0.0.1:8002;
+    server  127.0.0.1:9000;
+    server  127.0.0.1:9001;
+    server  127.0.0.1:9002;
 }
 
 server
 {
         listen 80;
-        server_name cmdb.yangmv.com;
+        server_name cmdb.opendevops.cn;
         access_log /var/log/nginx/cmdb_access.log;
         error_log  /var/log/nginx/cmdb_error.log;
         index index.html index.htm;
@@ -25,7 +25,7 @@ server
         #        alias /var/www/CMDB/static;
         #}
 
-        location /api/cmdb/ {
+        location /v1/cmdb/ {
                 proxy_set_header Host $http_host;
                 proxy_redirect off;
                 proxy_set_header X-Real-IP $remote_addr;

docs/supervisor_cmdb.conf

@@ -5,7 +5,7 @@ nodaemon=true
 command=python3 startup.py --port=90%(process_num)02d
 process_name=%(program_name)s_%(process_num)02d
 numprocs=3
-directory=/var/www/SuperCMDB
+directory=/var/www/CMDB
 user=root
 autostart=true
 autorestart=true

ops/urls.py

@@ -4,7 +4,7 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('v1/cmdb/docs/', get_swagger_view(title='API文档')),
     path('v1/cmdb/', include('assets.urls',namespace='api-assets')),
     path('api-auth/', include('rest_framework.urls',namespace='rest_framework')),
-    path('docs/', get_swagger_view(title='API文档')),
 ]