7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
pycook 2020-04-07 18:03:03 +08:00
parent 8348f8e7b1 75c48a0807
commit 5191d6ed73
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -26,7 +26,7 @@ COPY cmdb-api /data/apps/cmdb
WORKDIR /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 ENV TZ=Asia/Shanghai

4
cmdb-api/api/lib/cmdb/history.py
View File

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

6
docker-compose.yml
View File

@ -54,7 +54,7 @@ services:
- cmdb-search - cmdb-search
cmdb-api: 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: # build:
# context: . # context: .
# target: cmdb-api # target: cmdb-api
@ -74,7 +74,7 @@ services:
gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
flask init-cache flask init-cache
flask init-acl flask init-acl
celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1 celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
depends_on: depends_on:
- cmdb-db - cmdb-db
@ -86,7 +86,7 @@ services:
- cmdb-api - cmdb-api
cmdb-ui: 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: # build:
# context: . # context: .
# target: cmdb-ui # target: cmdb-ui