Merge branch 'master' of https://github.com/pycook/cmdb

Dockerfile

@@ -26,7 +26,7 @@ COPY cmdb-api /data/apps/cmdb
 
 WORKDIR /data/apps/cmdb
 
-RUN apk add --no-cache tzdata gcc musl-dev libffi-dev
+RUN apk add --no-cache tzdata gcc musl-dev libffi-dev openldap-dev
 
 ENV TZ=Asia/Shanghai
 

cmdb-api/api/lib/cmdb/history.py

@@ -1,4 +1,4 @@
-# -*- coding:utf-8 -*- 
+# -*- coding:utf-8 -*-
 
 
 import json
@@ -83,7 +83,7 @@ class AttributeHistoryManger(object):
 
         username = UserCache.get(record.uid).nickname or UserCache.get(record.uid).username
         timestamp = record.created_at.strftime("%Y-%m-%d %H:%M:%S")
-        attr_history = AttributeHistory.get_By(record_id=record_id, to_dict=False)
+        attr_history = AttributeHistory.get_by(record_id=record_id, to_dict=False)
         rel_history = CIRelationHistory.get_by(record_id=record_id, to_dict=False)
 
         attr_dict, rel_dict = dict(), {"add": [], "delete": []}

docker-compose.yml

@@ -54,7 +54,7 @@ services:
           - cmdb-search
 
   cmdb-api:
-    image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-api:2.1
+    image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-api:2.2
 #    build:
 #      context: .
 #      target: cmdb-api
@@ -74,7 +74,7 @@ services:
         gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
         flask init-cache
         flask init-acl
-        
+
         celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
     depends_on:
       - cmdb-db
@@ -86,7 +86,7 @@ services:
           - cmdb-api
 
   cmdb-ui:
-    image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-ui:2.1
+    image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-ui:2.2
 #    build:
 #      context: .
 #      target: cmdb-ui