From e69404bada1ab1655d669bb848f90d2dec3c2eb1 Mon Sep 17 00:00:00 2001
From: pycook <pycook@126.com>
Date: Wed, 1 Apr 2020 21:20:47 +0800
Subject: [PATCH] release version 2.1
---
Dockerfile | 2 +-
docker-compose.yml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ef5528e..cf4195b 100644
--- a/Dockerfile
+++ b/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
diff --git a/docker-compose.yml b/docker-compose.yml
index b6ab5ce..3038861 100644
--- a/docker-compose.yml
+++ b/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