diff --git a/docker-compose.yml b/docker-compose.yml index 2c7831c..d4b555d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: volumes: - db-data:/var/lib/mysql - ./docs/mysqld.cnf:/etc/mysql/conf.d/mysqld.cnf - - ./docs/cmdb.sql:/docker-entrypoint-initdb.d/cmdb.sql +# - ./docs/cmdb.sql:/docker-entrypoint-initdb.d/cmdb.sql command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci networks: new: @@ -33,7 +33,7 @@ services: - redis cmdb-api: - image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.3.9 + image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-api:2.3.10 # build: # context: . # target: cmdb-api @@ -49,10 +49,10 @@ services: /wait flask db-setup flask common-check-new-columns - gunicorn --workers=8 autoapp:app -b 0.0.0.0:5000 -D + gunicorn --workers=4 autoapp:app -b 0.0.0.0:5000 -D - celery -A celery_worker.celery worker -E -Q one_cmdb_async --autoscale=8,2 --logfile=one_cmdb_async.log -D - celery -A celery_worker.celery worker -E -Q acl_async --logfile=one_acl_async.log --concurrency=2 -D + celery -A celery_worker.celery worker -E -Q one_cmdb_async --autoscale=4,1 --logfile=one_cmdb_async.log -D + celery -A celery_worker.celery worker -E -Q acl_async --logfile=one_acl_async.log --autoscale=2,1 -D nohup flask cmdb-trigger > trigger.log 2>&1 & flask cmdb-init-cache @@ -68,7 +68,7 @@ services: - cmdb-api cmdb-ui: - image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.3.9 + image: registry.cn-hangzhou.aliyuncs.com/veops/cmdb-ui:2.3.10 # build: # context: . # target: cmdb-ui